From 144072f8ee06443d7ac7aa6164da8c35b4854db4 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 23 Mar 2012 10:28:35 +0200
Subject: Description getter should return what has been set and not convert it

---
 src/com/vaadin/terminal/gwt/client/ComponentState.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ComponentState.java b/src/com/vaadin/terminal/gwt/client/ComponentState.java
index 90821e8bde..10cd14251b 100644
--- 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());
     }
 
     /**
-- 
cgit v1.2.3