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

Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/01/16 17:43:33 UTC

svn commit: r899985 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java

Author: matzew
Date: Sat Jan 16 16:43:32 2010
New Revision: 899985

URL: http://svn.apache.org/viewvc?rev=899985&view=rev
Log:
TRINIDAD-1588 - NullPointerException using labelAndAccessKey Attribute in XMLMenuModel itemNode Definition

thx to Markus Dreher for the patch

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java?rev=899985&r1=899984&r2=899985&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/ImmutableItemNode.java Sat Jan 16 16:43:32 2010
@@ -519,6 +519,10 @@
         String label1 = new String(keyArray2, 0, j);
         label = label1;
       }
+      // https://issues.apache.org/jira/browse/TRINIDAD-1588
+      if (accessKey == null) {
+          return label;
+      }
       return _joinLabelAndAccessKey(label, accessKey);
     }
     return null;