Description getter should return what has been set and not convert it

diff --git a/src/com/vaadin/terminal/gwt/client/ComponentState.java b/src/com/vaadin/terminal/gwt/client/ComponentState.java
index 90821e8bdeadaca87acdf900cdee791c8164a768..10cd14251b65b606a99450f00d51504a04d6b8cf 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ComponentState.java
+++ b/src/com/vaadin/terminal/gwt/client/ComponentState.java
@@ -205,9 +205,6 @@ public class ComponentState extends SharedState {
      * @return component description (not null, can be empty string)
      */
     public String getDescription() {
-        if (description == null) {
-            return "";
-        }
         return description;
     }
 
@@ -229,7 +226,7 @@ public class ComponentState extends SharedState {
      * @return true if the component has a description
      */
     public boolean hasDescription() {
-        return !"".equals(getDescription());
+        return getDescription() != null && !"".equals(getDescription());
     }
 
     /**