You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by an...@apache.org on 2014/06/27 22:42:06 UTC

svn commit: r1606219 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/TrinidadSkinProvider.java

Author: andys
Date: Fri Jun 27 20:42:05 2014
New Revision: 1606219

URL: http://svn.apache.org/r1606219
Log:
TRINIDAD-2488 NPE in TrinidadSkinProvider when base skin is not included in skin def in trinidad-skins.xml

Thanks for the fix Prakash!

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/TrinidadSkinProvider.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/TrinidadSkinProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/TrinidadSkinProvider.java?rev=1606219&r1=1606218&r2=1606219&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/TrinidadSkinProvider.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/provider/TrinidadSkinProvider.java Fri Jun 27 20:42:05 2014
@@ -133,7 +133,10 @@ public final class TrinidadSkinProvider 
 
     // if there is no base skin then use the default base skin for the renderKit
     if (baseSkin == null)
+    {
       baseSkin = SkinUtils.getDefaultSkinForRenderKitId(provider, context, renderKitId);
+      baseSkinId = baseSkin.getId();
+    }
 
     if (id == null)
       throw new NullPointerException(_LOG.getMessage("NULL_SKIN_ID"));
@@ -244,4 +247,5 @@ public final class TrinidadSkinProvider 
 
   private final static TrinidadLogger _LOG =
     TrinidadLogger.createTrinidadLogger(TrinidadSkinProvider.class);
-}
\ No newline at end of file
+}
+