From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 12 Mar 2008 07:01:25 +0000 (+0000)
Subject: Abstract select assumed Property is always ValueChangeNotifier (bug in if -clause)
X-Git-Tag: 6.7.0.beta1~4942
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3b0c7f3c00ce0f2025f5100573331f5aa6dad9fe;p=vaadin-framework.git

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 b56c1752bd..9c0523e02e 100644
--- 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);