Fix for #7434

svn changeset:20923/svn branch:6.7

1 files changed, 10 insertions, 1 deletions

diff --git a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
index 60e81f2e44..db935e0124 100644
--- a/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
+++ b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
@@ -128,7 +128,7 @@ final public class ColumnProperty implements Property {
              * If the value to be set is the same that has already been set, do
              * not set it again.
              */
-            if (newValue.equals(value)) {
+            if (isValueAlreadySet(newValue)) {
                 return;
             }
         }
@@ -139,6 +139,15 @@ final public class ColumnProperty implements Property {
         modified = true;
     }
 
+    private boolean isValueAlreadySet(Object newValue) {
+        if (isModified()) {
+            return (isNullable() && newValue == null && changedValue == null)
+                    || newValue.equals(changedValue);
+        }
+        return (isNullable() && newValue == null && value == null)
+                || newValue.equals(value);
+    }
+
     public Class<?> getType() {
         return type;
     }