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/07/09 07:49:17 UTC

svn commit: r962418 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: lifecycle/LifecycleImpl.java view/facelets/FaceletViewDeclarationLanguage.java view/facelets/FaceletViewHandler.java

Author: lu4242
Date: Fri Jul  9 05:49:02 2010
New Revision: 962418

URL: http://svn.apache.org/viewvc?rev=962418&view=rev
Log:
MYFACES-2780 MyFaces performance improvements for production (small fixes)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=962418&r1=962417&r2=962418&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Fri Jul  9 05:49:02 2010
@@ -83,14 +83,13 @@ public class LifecycleImpl extends Lifec
         try
         {
             // check for updates of web.xml and faces-config descriptors 
-            // only on a first request or if project state is not production
-            if(!_firstRequestProcessed || !facesContext.getApplication().getProjectStage().equals(ProjectStage.Production) )
+            // only if project state is not production
+            if(!facesContext.isProjectStage(ProjectStage.Production))
             {
                 WebXml.update(facesContext.getExternalContext());
                 new FacesConfigurator(facesContext.getExternalContext()).update();
             }
             
-            
             PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, facesContext, getPhaseListeners());
             for (PhaseExecutor executor : lifecycleExecutors)
             {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java?rev=962418&r1=962417&r2=962418&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java Fri Jul  9 05:49:02 2010
@@ -1354,7 +1354,7 @@ public class FaceletViewDeclarationLangu
 
         // refresh period
         long refreshPeriod;
-        if(context.getApplication().getProjectStage().equals(ProjectStage.Production))
+        if(context.isProjectStage(ProjectStage.Production))
             refreshPeriod = _getLongParameter(eContext, PARAM_REFRESH_PERIOD, PARAM_REFRESH_PERIOD_DEPRECATED, DEFAULT_REFRESH_PERIOD_PRODUCTION);
         else
             refreshPeriod = _getLongParameter(eContext, PARAM_REFRESH_PERIOD, PARAM_REFRESH_PERIOD_DEPRECATED, DEFAULT_REFRESH_PERIOD);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java?rev=962418&r1=962417&r2=962418&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewHandler.java Fri Jul  9 05:49:02 2010
@@ -240,7 +240,7 @@ public class FaceletViewHandler extends 
         FacesContext ctx = FacesContext.getCurrentInstance();
         long refreshPeriod;
         
-        if(ctx.getApplication().getProjectStage().equals(ProjectStage.Production))
+        if(ctx.isProjectStage(ProjectStage.Production))
             refreshPeriod = DEFAULT_REFRESH_PERIOD_PRODUCTION;
         else
             refreshPeriod = DEFAULT_REFRESH_PERIOD;