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 2010/05/22 02:37:20 UTC

svn commit: r947221 - /myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java

Author: jwaldman
Date: Sat May 22 00:37:19 2010
New Revision: 947221

URL: http://svn.apache.org/viewvc?rev=947221&view=rev
Log:
TRINIDAD-1729 provide a hook for for an external decorator of Skin InputStreamProvider
fixed the ClassCastException found with the original checkin.
changed appMap.put(_SERVICES_RESOLVER_KEY, provider); to
appMap.put(_SERVICES_RESOLVER_KEY, customNameResolver);

Modified:
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java?rev=947221&r1=947220&r2=947221&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java Sat May 22 00:37:19 2010
@@ -628,10 +628,10 @@ class StyleSheetEntry
         if (_LOG.isFine())
           _LOG.fine(_SERVICES_RESOLVER_IOEXCEPTION_MSG);       
       }
-      // Found a provider. So store it away and return it from the method.
+      // Found a customNameResolver with a provider. So store it away and return it from the method.
       if (provider != null)
       {
-        appMap.put(_SERVICES_RESOLVER_KEY, provider);
+        appMap.put(_SERVICES_RESOLVER_KEY, customNameResolver);
         return customNameResolver;
       }
     }