[richfaces-svn-commits] JBoss Rich Faces SVN: r6430 - trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive.

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

Author: konstantin.mishin
Date: 2008-02-28 12:32:45 -0500 (Thu, 28 Feb 2008)
New Revision: 6430

Modified:
   trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
Log:
RF-1741

Modified: trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java	2008-02-28 16:54:19 UTC (rev 6429)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java	2008-02-28 17:32:45 UTC (rev 6430)
@@ -45,7 +45,7 @@
 					result = ((Comparator<Object>)p1).compare(w1.getWrappedObject(), w2.getWrappedObject());
 				} else if (p1 instanceof String && p2 instanceof String) {
 					result = ((String)p1).trim().compareToIgnoreCase(((String)p2).trim());
-				} if (p1 instanceof Comparable && p2 instanceof Comparable) {
+				} else if (p1 instanceof Comparable && p2 instanceof Comparable) {
 					result = ((Comparable<Object>) p1).compareTo(p2);
 				} else if (p1 == null && p2 != null) {
 					result = 1;