cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r629562 - in /cocoon/branches/BRANCH_2_1_X: src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java status.xml
Date Wed, 20 Feb 2008 18:25:48 GMT
Author: vgritsenko
Date: Wed Feb 20 10:25:37 2008
New Revision: 629562

URL: http://svn.apache.org/viewvc?rev=629562&view=rev
Log:
merged from trunk
    <action dev="VG" type="fix">
      Core: Fix flow scripts reload check logic.
    </action>

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?rev=629562&r1=629561&r2=629562&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Wed Feb 20 10:25:37 2008
@@ -113,7 +113,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
@@ -552,10 +552,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

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=629562&r1=629561&r2=629562&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Feb 20 10:25:37 2008
@@ -182,6 +182,9 @@
 
   <changes>
   <release version="2.1.12" date="TBD">
+    <action dev="VG" type="fix">
+      Core: Fix flow scripts reload check logic.
+    </action>
     <action dev="AG" type="fix" fixes-bug="COCOON-2020" due-to="Mark Lundquist" due-to-email="lundquist.mark@gmail.com">
       Forms: CAPTCHA &lt;input&gt; element should have autocomplete="off"
     </action>



Mime
View raw message