merged [9517] from 6.1

svn changeset:9518/svn branch:6.2

diff --git a/src/com/vaadin/data/util/BeanItemContainer.java b/src/com/vaadin/data/util/BeanItemContainer.java
index 03616821bf180e2a8f475753c54c4a7797ce20ce..aaa7d9cd560d6944d1b67128eeb7920fa285f724 100644 (file)
--- a/src/com/vaadin/data/util/BeanItemContainer.java
+++ b/src/com/vaadin/data/util/BeanItemContainer.java
@@ -414,7 +414,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
                     if (va == null) {
                         return (vb == null) ? 0 : -1;
                     } else if (vb == null) {
-                        return (va == null) ? 0 : 1;
+                        return 1;
                     }
 
                     return va.compareTo(vb);