You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by so...@apache.org on 2008/04/08 19:18:00 UTC

svn commit: r646007 - /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java

Author: sobryan
Date: Tue Apr  8 10:17:59 2008
New Revision: 646007

URL: http://svn.apache.org/viewvc?rev=646007&view=rev
Log:
TRINIDAD-1044 - TreeTableRender does not handle null iconURI

Modified:
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java?rev=646007&r1=646006&r2=646007&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java Tue Apr  8 10:17:59 2008
@@ -408,7 +408,14 @@
     }
 
     if (iconURI == null && icon != null)
-      iconURI = icon.getImageURI(context, rc).toString();
+    {
+      //This can be null so we need to check for it before doing toString
+      Object o = icon.getImageURI(context, rc);
+      if(o != null)
+      {
+        iconURI = o.toString();
+      }
+    }
 
     backgroundIconURI = getConnectingBackgroundIcon(context, rc, !isLastSibling, true);
     nodeBackgroundIconURI = getIconBackgroundIcon(context, rc, isLastSibling, true);