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 e601febe7bf70fd6deb92b7084354d16f2a9e854..bc6a1b9b7203115fe1b7ac374762163d032d6734 100644 (file)
--- 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 207b65775c20ef90db86caf5cdffd2c1f3b65a18..f2be96438dfae3bdcc0035157c4a99a89f736794 100644 (file)
--- 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) {