svn commit: r582003 - /portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java

[ate]

Author: ate
Date: Thu Oct  4 13:26:16 2007
New Revision: 582003

URL: http://svn.apache.org/viewvc?rev=582003&view=rev
Log:
Fix for PB-71: FacesPortlet should apply RenderKitFactory.HTML_BASIC_RENDER_KIT 
when default-render-kit-id is not specified
See: http://issues.apache.org/jira/browse/PB-71
and: http://issues.apache.org/jira/browse/PB-66#action_12512616

Modified:
    
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java

Modified: 
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
URL: 
http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java?rev=582003&r1=582002&r2=582003&view=diff
==============================================================================
--- 
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
 (original)
+++ 
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
 Thu Oct  4 13:26:16 2007
@@ -649,8 +649,8 @@
             {
                 facesContext.setViewRoot(new PortletUIViewRoot());
                 facesContext.getViewRoot().setViewId(view);
-                facesContext.getViewRoot().setRenderKitId(
-                        facesContext.getApplication().getDefaultRenderKitId());
+                String defaultRenderKitId = 
facesContext.getApplication().getDefaultRenderKitId();
+                facesContext.getViewRoot().setRenderKitId(defaultRenderKitId 
!= null ? defaultRenderKitId : RenderKitFactory.HTML_BASIC_RENDER_KIT);
                 portletRequest.getPortletSession().setAttribute(
                         createViewRootKey(facesContext, view, viewId),
                         facesContext.getViewRoot());
@@ -680,8 +680,8 @@
                 {
                     facesContext.setViewRoot(new PortletUIViewRoot());
                     facesContext.getViewRoot().setViewId(view);
-                    facesContext.getViewRoot().setRenderKitId(
-                            
facesContext.getApplication().getDefaultRenderKitId());
+                    String defaultRenderKitId = 
facesContext.getApplication().getDefaultRenderKitId();
+                    
facesContext.getViewRoot().setRenderKitId(defaultRenderKitId != null ? 
defaultRenderKitId : RenderKitFactory.HTML_BASIC_RENDER_KIT);
                     portletRequest.getPortletSession().setAttribute(
                             createViewRootKey(facesContext, view, viewId),
                             facesContext.getViewRoot());



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]