You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2007/01/10 10:25:50 UTC
svn commit: r494774 - in
/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow:
CompilingInterpreter.java javascript/fom/FOM_JavaScriptInterpreter.java
Author: cziegeler
Date: Wed Jan 10 01:25:48 2007
New Revision: 494774
URL: http://svn.apache.org/viewvc?view=rev&rev=494774
Log:
Fix COCOON-1979
Check for reloading of javascript files loaded by cocoon.load().
Modified:
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/CompilingInterpreter.java
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Modified: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/CompilingInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/CompilingInterpreter.java?view=diff&rev=494774&r1=494773&r2=494774
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/CompilingInterpreter.java (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/CompilingInterpreter.java Wed Jan 10 01:25:48 2007
@@ -102,6 +102,10 @@
return source;
}
+ public long getCompileTime() {
+ return compileTime;
+ }
+
public Script getScript(Context context, Scriptable scope,
boolean refresh, CompilingInterpreter interpreter)
throws Exception {
Modified: cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?view=diff&rev=494774&r1=494773&r2=494774
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Wed Jan 10 01:25:48 2007
@@ -483,7 +483,9 @@
} else {
this.sourceresolver.release(src);
}
- compiledScript = entry.getScript(cx, this.scope, false, this);
+ boolean needsRefresh = reloadScripts &&
+ (entry.getCompileTime() + checkTime < System.currentTimeMillis());
+ compiledScript = entry.getScript(cx, this.scope, needsRefresh, this);
return compiledScript;
}
}