svn commit: r742824 - /myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java

[jw...@apache.org]

Author: jwaldman
Date: Tue Feb 10 02:33:55 2009
New Revision: 742824

URL: http://svn.apache.org/viewvc?rev=742824&view=rev
Log:
TRINIDAD-1358 if there is a skin [stylesheet] id mismatch between producer and consumer, use the skin anyway instead of the portlet skin
1.2.10.1-branch
Fix a bug when the style cache directory did not exist when a skin was switched.
Added back the accidentally deleted:
            // set up the styleProvider first, so that it will create the /adf/style
            // directory. Otherwise the following code would get an error when it
            // tries to getStyleDir. This could possibly be done better.
            getStyleContext().getStyleProvider();

Modified:
    myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java

Modified: myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java?rev=742824&r1=742823&r2=742824&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java (original)
+++ myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderingContext.java Tue Feb 10 02:33:55 2009
@@ -526,6 +526,11 @@
 
           if (requestMapStyleSheetId != null)
           {
+            // set up the styleProvider first, so that it will create the /adf/style
+            // directory. Otherwise the following code would get an error when it
+            // tries to getStyleDir. This could possibly be done better.
+            getStyleContext().getStyleProvider();
+            
             String skinForPortalStyleSheetId = requestedSkin.getStyleSheetDocumentId(this);
             if (skinForPortalStyleSheetId != null &&
               skinForPortalStyleSheetId.equals(requestMapStyleSheetId))