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/26 00:43:14 UTC
svn commit: r948231 -
/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
Author: jwaldman
Date: Tue May 25 22:43:14 2010
New Revision: 948231
URL: http://svn.apache.org/viewvc?rev=948231&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);
checkin to 1.2.12.3-branch
Modified:
myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java?rev=948231&r1=948230&r2=948231&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java Tue May 25 22:43:14 2010
@@ -638,10 +638,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;
}
}