You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2008/02/20 19:20:52 UTC
svn commit: r629557 - in
/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src:
changes/changes.xml
main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Author: vgritsenko
Date: Wed Feb 20 10:20:41 2008
New Revision: 629557
URL: http://svn.apache.org/viewvc?rev=629557&view=rev
Log:
<action dev="vgritsenko" type="fix">
Fix flow scripts reload check logic.
</action>
Modified:
cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml
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/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml?rev=629557&r1=629556&r2=629557&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-flowscript/cocoon-flowscript-impl/src/changes/changes.xml Wed Feb 20 10:20:41 2008
@@ -17,17 +17,24 @@
specific language governing permissions and limitations
under the License.
-->
-<!--+
- | @version $Id$
- +-->
+
+<!--
+ - $Id$
+ -->
<document>
<properties>
<title>Changes Cocoon FlowScript Implementation</title>
</properties>
<body>
- <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">
-
- </release>
+ <release version="1.0.0" date="2008-??-??" description="unreleased">
+ <action dev="vgritsenko" type="fix">
+ Fix flow scripts reload check logic.
+ </action>
+ </release>
+ <release version="1.0.0-RC2" date="2007-09-26" description="released">
+ </release>
+ <release version="1.0.0-RC1" date="2007-05-18" description="released">
+ </release>
<release version="1.0.0-M2" date="2007-03-02" description="released">
<action dev="cziegeler" type="add">
Make settings bean and web application context available via the cocoon object in
@@ -44,3 +51,4 @@
</release>
</body>
</document>
+
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?rev=629557&r1=629556&r2=629557&view=diff
==============================================================================
--- 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 Feb 20 10:20:41 2008
@@ -100,7 +100,7 @@
* When was the last time we checked for script modifications. Used
* only if {@link #reloadScripts} is true.
*/
- private long lastTimeCheck;
+ private long lastReloadCheckTime;
/**
* Shared global scope for scripts and other immutable objects
@@ -401,10 +401,10 @@
boolean needsRefresh = false;
if (reloadScripts) {
long now = System.currentTimeMillis();
- if (now >= lastTimeCheck + checkTime) {
+ if (now >= lastReloadCheckTime + checkTime) {
needsRefresh = true;
+ lastReloadCheckTime = now;
}
- lastTimeCheck = now;
}
// We need to setup the FOM_Cocoon object according to the current