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

Posted to commits@myfaces.apache.org by jw...@apache.org on 2013/10/21 19:10:12 UTC

svn commit: r1534278 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java

Author: jwaldman
Date: Mon Oct 21 17:10:11 2013
New Revision: 1534278

URL: http://svn.apache.org/r1534278
Log:
TRINIDAD-2421 NullPointerException when property not resolvable through -tr-property-ref
Thanks to Prakash Udupa for the patch

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?rev=1534278&r1=1534277&r2=1534278&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Mon Oct 21 17:10:11 2013
@@ -789,7 +789,14 @@ public class FileSystemStyleCache implem
           }
         }
         
-        skinPropertiesMap.put(key, (propValueObj != null ? propValueObj : value));
+        if (propValueObj != null) 
+        {
+          skinPropertiesMap.put(key,propValueObj);
+        }
+        else if (value != null)
+        {
+          skinPropertiesMap.put(key, value);
+        }
       }
     }
     return skinPropertiesMap;