From 64d97da9fa7e5c13a28c39a859d90fb132157370 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 30 Oct 2009 13:33:57 +0000
Subject: [PATCH] merged [9517] from 6.1

svn changeset:9518/svn branch:6.2
---
 src/com/vaadin/data/util/BeanItemContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.39.5