summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2010-06-01 10:36:59 +0000
committerHenri Sara <henri.sara@itmill.com>2010-06-01 10:36:59 +0000
commit734b4fa1a99835b1270549d482cf4b2f0f7c9428 (patch)
tree8a0e863fafc3aec7847b1e5eec2571396ddd1c75
parent57ee892bcd00ecc982448d6cc31c51a855da367e (diff)
downloadvaadin-framework-734b4fa1a99835b1270549d482cf4b2f0f7c9428.tar.gz
vaadin-framework-734b4fa1a99835b1270549d482cf4b2f0f7c9428.zip
#5111 incorrect null check in Panel.removeAction()
svn changeset:13457/svn branch:6.3
-rw-r--r--src/com/vaadin/ui/Panel.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index d4fb66deb6..ce3e8bb582 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -501,7 +501,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
public <T extends Action & com.vaadin.event.Action.Listener> void removeAction(
T action) {
- if (actionManager == null) {
+ if (actionManager != null) {
actionManager.removeAction(action);
}
}