Changeset 264

Timestamp:

11/04/06 19:13:23 (2 years ago)

Author:

scorfield

Message:

Fixes #99 again - the previous fix did not account for both circuit.xml and circuit.xml.cfm files.

Location:

framework/trunk

Files:

• fuseboxApplication.cfc (modified) (1 diff)
• fuseboxCircuit.cfc (modified) (1 diff)
• myFusebox.cfc (modified) (1 diff)

framework/trunk/fuseboxApplication.cfc

@@ -93 +93 @@
                                         hint="I am the myFusebox data structure." />
                 
-                <!--- fixed ticket 99 --->
+                <!--- fixed ticket 99 again --->
                 <cfset var myVersion = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#" />
 

framework/trunk/fuseboxCircuit.cfc

@@ -109 +109 @@
 
                 <cfif structKeyExists(this,"timestamp")>
+                        <cfif not fileExists(variables.fullPath & circuitFile)>
+                                <cfset circuitFile = "circuit.xml" />
+                        </cfif>
                         <!--- Java timestamp solution provided by Daniel Schmid --->
                         <cfset myCircuitFilePath = variables.fullPath & circuitFile />
                         <cfset jCircuitFile = createObject("java","java.io.File").init(myCircuitFilePath) />
                         <cfset dtLastModified = createObject("java","java.util.Date").init(jCircuitFile.lastModified()) />
-                        <cfset needToLoad = parseDateTime(dtLastModified) gt parseDateTime(variables.timestamp) />
+                        <cfset needToLoad = parseDateTime(dtLastModified) gt parseDateTime(this.timestamp) />
                 </cfif>
 

framework/trunk/myFusebox.cfc

@@ -51 +51 @@
 <cfcomponent hint="I provide the per-request myFusebox data structure and some convenience methods.">
         <cfscript>
-        // fixed ticket 99
+        // fixed ticket 99 again
         this.version.runtime     = "5.0.1.#REReplace('$LastChangedRevision$','[^0-9]','','all')#";