[richfaces-svn-commits] JBoss Rich Faces SVN: r14400 - branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-05-28 12:32:10 -0400 (Thu, 28 May 2009)
New Revision: 14400

Modified:
   branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java
   branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
Log:
https://jira.jboss.org/jira/browse/RF-7268

Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java	2009-05-28 16:04:12 UTC (rev 14399)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator.java	2009-05-28 16:32:10 UTC (rev 14400)
@@ -64,9 +64,9 @@
 			if (p1 instanceof Comparable && p2 instanceof Comparable) {
 				result = ((Comparable<Object>) p1).compareTo(p2);
 			} else if (p1 == null && p2 != null) {
+				result = -1;
+			} else if (p2 == null && p1 != null) {
 				result = 1;
-			} else if (p2 == null && p1 != null) {
-				result = -1;
 			}
 			
 			if (asc != null && !asc.booleanValue()) {

Modified: branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java	2009-05-28 16:04:12 UTC (rev 14399)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java	2009-05-28 16:32:10 UTC (rev 14400)
@@ -101,9 +101,9 @@
 				} else if (p1 instanceof Comparable && p2 instanceof Comparable) {
 					result = ((Comparable<Object>) p1).compareTo(p2);
 				} else if (p1 == null && p2 != null) {
+					result = -1;
+				} else if (p2 == null && p1 != null) {
 					result = 1;
-				} else if (p2 == null && p1 != null) {
-					result = -1;
 				}
 				
 				if (ordering.equals(Ordering.DESCENDING)) {