You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/04/27 03:34:50 UTC

svn commit: r938288 - in /myfaces/core/trunk: api/src/main/java/javax/faces/component/UIComponentBase.java impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java

Author: lu4242
Date: Tue Apr 27 01:34:50 2010
New Revision: 938288

URL: http://svn.apache.org/viewvc?rev=938288&view=rev
Log:
MYFACES-2680 Cache renderKit used

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=938288&r1=938287&r2=938288&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Tue Apr 27 01:34:50 2010
@@ -1027,9 +1027,8 @@ public abstract class UIComponentBase ex
         String rendererType = getRendererType();
         if (rendererType == null)
             return null;
-        String renderKitId = context.getViewRoot().getRenderKitId();
-        RenderKitFactory rkf = (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
-        RenderKit renderKit = rkf.getRenderKit(context, renderKitId);
+        
+        RenderKit renderKit = context.getRenderKit();
         Renderer renderer = renderKit.getRenderer(getFamily(), rendererType);
         if (renderer == null)
         {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java?rev=938288&r1=938287&r2=938288&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java Tue Apr 27 01:34:50 2010
@@ -86,6 +86,9 @@ public class FacesContextImpl extends Fa
     private ExceptionHandler _exceptionHandler = null;
     private PartialViewContext _partialViewContext = null;
     private ReleaseableFacesContextFactory _facesContextFactory = null;
+    // Variables used to cache values
+    private RenderKit _cachedRenderKit = null;
+    private String _cachedRenderKitId = null;
 
     // ~ Constructors -------------------------------------------------------------------------------
     public FacesContextImpl(final ServletContext servletContext, final ServletRequest servletRequest,
@@ -253,8 +256,14 @@ public class FacesContextImpl extends Fa
         {
             return null;
         }
-
-        return _renderKitFactory.getRenderKit(this, renderKitId);
+        
+        if (_cachedRenderKitId == null || !renderKitId.equals(_cachedRenderKitId))
+        {
+            _cachedRenderKitId = renderKitId;
+            _cachedRenderKit = _renderKitFactory.getRenderKit(this, renderKitId);
+        }
+        
+        return _cachedRenderKit;
     }
 
     @Override
@@ -418,6 +427,8 @@ public class FacesContextImpl extends Fa
         _responseWriter = null;
         _viewRoot = null;
         _partialViewContext = null;
+        _cachedRenderKit = null;
+        _cachedRenderKitId = null;
 
         _released = true;
         FacesContext.setCurrentInstance(null);