summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/src/com/vaadin/ui/Tree.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index 700195cd4b..64854ebcdf 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -209,7 +209,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
* was set
*/
public String getItemIconAlternateText(Object itemId) {
- return itemIconAlts.get(itemId);
+ String storedAlt = itemIconAlts.get(itemId);
+ return storedAlt == null ? "" : storedAlt;
}
/* Expanding and collapsing */