Merged 6.2.2 fixes from /versions/6.2

svn changeset:10761/svn branch:6.3

1 files changed, 14 insertions, 0 deletions

diff --git a/src/com/vaadin/data/util/DefaultItemSorter.java b/src/com/vaadin/data/util/DefaultItemSorter.java
index 5cec2dc461..aefdbf1cc9 100644
--- a/src/com/vaadin/data/util/DefaultItemSorter.java
+++ b/src/com/vaadin/data/util/DefaultItemSorter.java
@@ -62,6 +62,20 @@ public class DefaultItemSorter implements ItemSorter {
         Item item1 = container.getItem(o1);
         Item item2 = container.getItem(o2);
 
+        /*
+         * Items can be null if the container is filtered. Null is considered
+         * "less" than not-null.
+         */
+        if (item1 == null) {
+            if (item2 == null) {
+                return 0;
+            } else {
+                return 1;
+            }
+        } else if (item2 == null) {
+            return -1;
+        }
+
         for (int i = 0; i < sortPropertyIds.length; i++) {
 
             int result = compareProperty(sortPropertyIds[i], sortDirections[i],