diff options
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/UIDL.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VTextField.java | 3 |
2 files changed, 3 insertions, 2 deletions
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) { |