summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2009-10-30 13:33:57 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2009-10-30 13:33:57 +0000
commit64d97da9fa7e5c13a28c39a859d90fb132157370 (patch)
tree2b679ca26354cf9f26c2e969162587a98c3ae77e
parentd4995d9ff01b46139c4c242eaac66a2dfd548292 (diff)
downloadvaadin-framework-64d97da9fa7e5c13a28c39a859d90fb132157370.tar.gz
vaadin-framework-64d97da9fa7e5c13a28c39a859d90fb132157370.zip
merged [9517] from 6.1
svn changeset:9518/svn branch:6.2
-rw-r--r--src/com/vaadin/data/util/BeanItemContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/data/util/BeanItemContainer.java b/src/com/vaadin/data/util/BeanItemContainer.java
index 03616821bf..aaa7d9cd56 100644
--- 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);