Abstract select assumed Property is always ValueChangeNotifier (bug in if -clause)

svn changeset:4028/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/AbstractSelect.java b/src/com/itmill/toolkit/ui/AbstractSelect.java
index b56c1752bdc5711c18a37d5d0e8b133d3a6d37f0..9c0523e02ed88816746d571852b351bf8d4e6959 100644 (file)
--- a/src/com/itmill/toolkit/ui/AbstractSelect.java
+++ b/src/com/itmill/toolkit/ui/AbstractSelect.java
@@ -1633,7 +1633,7 @@ public abstract class AbstractSelect extends AbstractField implements
             case ITEM_CAPTION_MODE_PROPERTY:
                 final Property p = getContainerProperty(itemId,
                         getItemCaptionPropertyId());
-                if (p != null || p instanceof Property.ValueChangeNotifier) {
+                if (p != null && p instanceof Property.ValueChangeNotifier) {
                     ((Property.ValueChangeNotifier) p)
                             .addListener(getCaptionChangeListener());
                     captionChangeNotifiers.add(p);