You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/01/15 17:32:40 UTC

svn commit: r899688 - /myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java

Author: werpu
Date: Fri Jan 15 16:32:39 2010
New Revision: 899688

URL: http://svn.apache.org/viewvc?rev=899688&view=rev
Log:
fixup a refactoring error
added recompile supression if recommended is not set

https://issues.apache.org/jira/browse/EXTSCRIPT-43

Modified:
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=899688&r1=899687&r2=899688&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Fri Jan 15 16:32:39 2010
@@ -419,7 +419,7 @@
     }
 
     public void fullRecompile() {
-        if (isFullyRecompiled()) {
+        if (isFullyRecompiled() || !isRecompileRecommended()) {
             return;
         }
 
@@ -441,6 +441,10 @@
         markAsFullyRecompiled();
     }
 
+    protected boolean isRecompileRecommended() {
+        return WeavingContext.getRefreshContext().isRecompileRecommended(getScriptingEngine());    
+    }
+
     protected boolean isFullyRecompiled() {
         FacesContext context = FacesContext.getCurrentInstance();
         if (context != null) {
@@ -458,7 +462,7 @@
                 requestMap.put(this.getClass().getName() + "_recompiled", Boolean.TRUE);
             }
         }
-        WeavingContext.getRefreshContext().setRecompileRecommended(ScriptingConst.ENGINE_TYPE_GROOVY, Boolean.FALSE);
+        WeavingContext.getRefreshContext().setRecompileRecommended(getScriptingEngine(), Boolean.FALSE);
     }
 
     /**