From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 1 Sep 2009 08:25:54 +0000 (+0000)
Subject: Fixed #3177 - PropertyFormatter NPE
X-Git-Tag: 6.7.0.beta1~2557
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c378046be94dae66133122665ba30c09d0522e21;p=vaadin-framework.git

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 616c1beb0a..07a39d83f8 100644
--- 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();
     }