From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 25 Aug 2009 08:44:13 +0000 (+0000)
Subject: fixes a regression since UIDL refactoring (non-hosted mode only)
X-Git-Tag: 6.7.0.beta1~2593
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c635285fd86a8c26a996f92bb7e1a8728308ecdf;p=vaadin-framework.git

fixes a regression since UIDL refactoring (non-hosted mode only)

svn changeset:8544/svn branch:6.1
---

diff --git a/src/com/vaadin/terminal/gwt/client/UIDL.java b/src/com/vaadin/terminal/gwt/client/UIDL.java
index e601febe7b..bc6a1b9b72 100644
--- a/src/com/vaadin/terminal/gwt/client/UIDL.java
+++ b/src/com/vaadin/terminal/gwt/client/UIDL.java
@@ -196,7 +196,7 @@ public final class UIDL extends JavaScriptObject {
     }
 
     public boolean hasVariable(String name) {
-        return var().containsKey(name);
+        return hasVariables() && var().containsKey(name);
     }
 
     public String getStringVariable(String name) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
index 207b65775c..f2be96438d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
@@ -102,7 +102,8 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
             setColumns(new Integer(uidl.getStringAttribute("cols")).intValue());
         }
 
-        String text = uidl.getStringVariable("text");
+        String text = uidl.hasVariable("text") ? uidl.getStringVariable("text")
+                : null;
         setPrompting(inputPrompt != null && focusedTextField != this
                 && (text == null || text.equals("")));
         if (prompting) {