From: Jani Laakso <jani.laakso@itmill.com>
Date: Mon, 10 Mar 2008 08:48:55 +0000 (+0000)
Subject: Fixed NPE (warning message): for variable change requests which relate to non-existen... 
X-Git-Tag: 6.7.0.beta1~4957
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3f16fb9c8dc69ee3e02f082205e13f7ebd6380ae;p=vaadin-framework.git

Fixed NPE (warning message): for variable change requests which relate to non-existent components.

svn changeset:4009/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
index 70e85f0e28..ed7461c7d6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
@@ -516,16 +516,17 @@ public class CommunicationManager implements Paintable.RepaintRequestListener {
                 } else {
                     // Ignore variable change
                     String msg = "Warning: Ignoring variable change for ";
+                    String caption = null;
                     if (owner != null) {
                         msg += "disabled component " + owner.getClass();
+                        caption = ((Component) owner).getCaption();
+                        if (caption != null) {
+                            msg += ", caption=" + caption;
+                        }
                     } else {
                         msg += "non-existent component, VAR_PID="
                                 + variable[VAR_PID];
                     }
-                    String caption = ((Component) owner).getCaption();
-                    if (caption != null) {
-                        msg += ", caption=" + caption;
-                    }
                     System.err.println(msg);
                     continue;
                 }