diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-09-01 08:25:54 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-09-01 08:25:54 +0000 |
| commit | c378046be94dae66133122665ba30c09d0522e21 (patch) | |
| tree | 0e7df2ca4cb8e96a4cf71a893a26a66fd4d6b4bd /src | |
| parent | 8e6f3f883f1d4a000be56e72614988a6710696dd (diff) | |
| download | vaadin-framework-c378046be94dae66133122665ba30c09d0522e21.tar.gz vaadin-framework-c378046be94dae66133122665ba30c09d0522e21.zip | |
Fixed #3177 - PropertyFormatter NPE
svn changeset:8604/svn branch:6.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/data/util/PropertyFormatter.java | 5 |
1 files changed, 2 insertions, 3 deletions
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(); } |