svn commit: r556762 - /myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java

[aw...@apache.org]

Author: awiner
Date: Mon Jul 16 16:05:31 2007
New Revision: 556762

URL: http://svn.apache.org/viewvc?view=rev&rev=556762
Log:
TRINIDAD-102: Attempt to get the value of a custom property from a node that has no custom properties causes NPE
- Patch from Gary Kind

Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java

Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java?view=diff&rev=556762&r1=556761&r2=556762
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/XMLMenuModel.java Mon Jul 16 16:05:31 2007
@@ -480,6 +480,12 @@
       Map<String, String> propMap = 
         (Map<String, String>) resolver.getValue(node, _CUSTOM_ATTR_LIST);
         
+      // Need to check to see if propMap is null.  If there are
+      // no custom properties for this itemNode, there will be
+      // no propMap.  See MenuContentHandler._createItemNode().
+      if (propMap == null)
+        return null;
+
       value = propMap.get(propName);
     }
     catch (PropertyNotFoundException ex)