Changeset 221

Timestamp:

07/07/06 16:12:29 (3 years ago)

Author:

scorfield

Message:

Fixes #96 by moving the timestamp inside the conditional load of the XML file and also exposing timestamp as a public attribute of circuit to match FB41.

Location:

fusebox5

Files:

• fuseboxApplication.cfc (modified) (2 diffs)
• fuseboxCircuit.cfc (modified) (2 diffs)

fusebox5/fuseboxApplication.cfc

@@ -229 +229 @@
                         <cfset variables.fbCode = fbCode />
                         <cfset variables.fbFile = fbFile />
+                        <cfset this.timestamp = now() />
                 </cfif>
                 
@@ -245 +246 @@
                 <cfset this.isFullyLoaded = true />
                 <cfset this.applicationStarted = false />
-                <cfset this.timestamp = now() />
                 <cfset this.dateLastLoaded = now() />
                 

fusebox5/fuseboxCircuit.cfc

@@ -105 +105 @@
                 <cfset var circuitFiles = 0 />
 
-                <cfif structKeyExists(variables,"timestamp")>
+                <cfif structKeyExists(this,"timestamp")>
                         <cfdirectory action="list" directory="#variables.fullPath#" filter="circuit.xml*" name="circuitFiles" />
                         <cfif circuitFiles.recordCount eq 1>
-                                <cfset needToLoad = parseDateTime(circuitFiles.dateLastModified) gt parseDateTime(variables.timestamp) />
+                                <cfset needToLoad = parseDateTime(circuitFiles.dateLastModified) gt parseDateTime(this.timestamp) />
                         <!--- else ignore the ambiguity --->
                         </cfif>
@@ -179 +179 @@
                         <cfset loadFuseactions(circuitCode) />
                         <cfset variables.circuitFile = circuitFile />
-                </cfif>
-                
-                <cfset variables.timestamp = now() />
+                        <cfset this.timestamp = now() />
+                </cfif>
                 
                 <cfreturn this />