Author: konstantin.mishin Date: 2011-01-20 09:48:14 -0500 (Thu, 20 Jan 2011) New Revision: 21118 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java Log: RF-10189 Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java 2011-01-20 14:48:06 UTC (rev 21117) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/model/ArrangeableModel.java 2011-01-20 14:48:14 UTC (rev 21118) @@ -324,12 +324,12 @@ stringComparator = createStringComparator(context); } result = stringComparator.compare(((String) value1).trim(), ((String) value2).trim()); - } else if (value1 instanceof Comparable<?>) { - result = ((Comparable) value1).compareTo(value2); } else if (value1 == null && value2 != null) { result = -1; } else if (value2 == null && value1 != null) { result = 1; + } else if (value1 instanceof Comparable<?>) { + result = ((Comparable) value1).compareTo(value2); } return result; }