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 2017/02/22 23:31:01 UTC
svn commit: r1784074 - in /myfaces/core/trunk/impl/src:
main/java/org/apache/myfaces/view/facelets/pool/impl/
test/resources/org/apache/myfaces/view/facelets/pool/
Author: lu4242
Date: Wed Feb 22 23:31:01 2017
New Revision: 1784074
URL: http://svn.apache.org/viewvc?rev=1784074&view=rev
Log:
MYFACES-4100 Default view pool is enabled for all views by default when cache mode is alwaysRecompile only
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolFactoryImpl.java
myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup1.xhtml
myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup2.xhtml
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolFactoryImpl.java?rev=1784074&r1=1784073&r2=1784074&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolFactoryImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolFactoryImpl.java Wed Feb 22 23:31:01 2017
@@ -28,6 +28,7 @@ import org.apache.myfaces.config.Runtime
import org.apache.myfaces.config.element.ViewPoolMapping;
import org.apache.myfaces.config.element.ViewPoolParameter;
import org.apache.myfaces.shared.util.ViewProtectionUtils;
+import org.apache.myfaces.view.facelets.ViewPoolProcessor;
import org.apache.myfaces.view.facelets.pool.ViewPool;
import org.apache.myfaces.view.facelets.pool.ViewPoolFactory;
@@ -75,6 +76,14 @@ public class ViewPoolFactoryImpl extends
}
if (defaultViewPool != null)
{
+ // The default view pool applies to all views that does not have any view pool mapping,
+ // but only when oamEnableViewPool is set, so we need a check here when it is not to avoid
+ // use view pool on all views when only alwaysRecompile is set to true.
+ Boolean enableViewPool = (Boolean) root.getAttributes().get(ViewPoolProcessor.ENABLE_VIEW_POOL);
+ if (enableViewPool == null)
+ {
+ return null;
+ }
return defaultViewPool;
}
return null;
Modified: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup1.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup1.xhtml?rev=1784074&r1=1784073&r2=1784074&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup1.xhtml (original)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup1.xhtml Wed Feb 22 23:31:01 2017
@@ -23,6 +23,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core">
+<f:view oamEnableViewPool="true">
<h:head>
<title>Test Static Page No Form</title>
</h:head>
@@ -36,4 +37,5 @@
<h:outputText value="Hello!"/>
</div>
</h:body>
+</f:view>
</html>
Modified: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup2.xhtml?rev=1784074&r1=1784073&r2=1784074&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup2.xhtml (original)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/view/facelets/pool/dynPageResourceCleanup2.xhtml Wed Feb 22 23:31:01 2017
@@ -28,6 +28,7 @@
<title>Test Static Page No Form</title>
</h:head>
<h:body>
+ <f:view oamEnableViewPool="true">
<div id="container">
<h1>Test cache of static page with no form elements</h1>
<br/>
@@ -36,5 +37,6 @@
</c:if>
<h:outputText value="Hello!"/>
</div>
+ </f:view>
</h:body>
</html>