Fixed #3177 - PropertyFormatter NPE

svn changeset:8604/svn branch:6.1

diff --git a/src/com/vaadin/data/util/PropertyFormatter.java b/src/com/vaadin/data/util/PropertyFormatter.java
index 616c1beb0a114b43101b0ef8548674e21fbc1ad0..07a39d83f86556fa5cd90f862ea8b93339bf68c8 100644 (file)
--- a/src/com/vaadin/data/util/PropertyFormatter.java
+++ b/src/com/vaadin/data/util/PropertyFormatter.java
@@ -118,7 +118,7 @@ public abstract class PropertyFormatter implements Property,
         }
         String newVal = toString();
         if ((prevValue == null && newVal != null)
-                || !prevValue.equals(prevValue)) {
+                || (prevValue != null && !prevValue.equals(newVal))) {
             fireValueChange();
         }
     }
@@ -362,8 +362,7 @@ public abstract class PropertyFormatter implements Property,
      * 
      * This should not be called directly.
      */
-    public void valueChange(
-            com.vaadin.data.Property.ValueChangeEvent event) {
+    public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) {
         fireValueChange();
     }