Skip to content
Browse files

Checks for Railo 3.4

  • Loading branch information...
1 parent 7484100 commit 232a7369afb6460a9c334abe0e2c2bc8dcd81a99 @aliaspooryorik aliaspooryorik committed Jul 3, 2012
Showing with 12 additions and 5 deletions.
  1. +2 −1 .gitignore
  2. +4 −1 model/engine/CFMLEngine.cfc
  3. +4 −1 model/engine/CFMLEngineService.cfc
  4. +1 −1 settings.xml
  5. +1 −1 tests/unit/model/engine/RailoEngineTest.cfc
View
3 .gitignore
@@ -4,4 +4,5 @@ config.json.cfm
*.rrd
tools/monitor/images/*.png
logs/*
-!logs/readme.txt
+!logs/readme.txt
+.settings/*
View
5 model/engine/CFMLEngine.cfc
@@ -94,7 +94,10 @@
/* returns used JVM memory in MBytes */
numeric function getJVMUsedMemory(){
- return getJVMTotalMemory() - getJVMFreeMemory();
+ // for some reason doing this on one line is really slow.
+ var totalMemory = getJVMTotalMemory();
+ var freeMemory = getJVMFreeMemory();
+ return totalMemory - freeMemory;
}
/* returns JVM uptime in milliseconds */
View
5 model/engine/CFMLEngineService.cfc
@@ -6,7 +6,10 @@
variables.CFMLEngine = new CFMLEngine();
- // load specialised version...
+ /*
+ load specialised version, will probably have to switch to decorator
+ pattern to support CF10 differences...
+ */
switch ( UCase( variables.CFMLEngine.getProductName() ) ){
case "COLDFUSION":
variables.CFMLEngine = new ColdFusionEngine();
View
2 settings.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" ?><ResourceDetails><ServerName></ServerName><LauncherName></LauncherName><ExternalBrowser></ExternalBrowser><UseStartPage>false</UseStartPage><StartPage useextension="false" ></StartPage><Mappings></Mappings><VariableMappings></VariableMappings><DictionaryVersion>ColdFusion10</DictionaryVersion><CFCMappings></CFCMappings></ResourceDetails>
+<?xml version="1.0" encoding="UTF-8" ?><ResourceDetails><ServerName></ServerName><LauncherName></LauncherName><ExternalBrowser></ExternalBrowser><UseStartPage>false</UseStartPage><StartPage useextension="false" ></StartPage><Mappings></Mappings><VariableMappings></VariableMappings></ResourceDetails>
View
2 tests/unit/model/engine/RailoEngineTest.cfc
@@ -42,7 +42,7 @@
* @excludeEngine COLDFUSION
*/
function getVersion(){
- assertTrue( ReFindNoCase( "^3\.3\.[2-3]\.[0-9]{1,}$", CUT.getVersion() ) > 0 );
+ assertTrue( ReFindNoCase( "^3\.3\.[2-9]\.[0-9]{1,}$", CUT.getVersion() ) > 0 );
}
/**

0 comments on commit 232a736

Please sign in to comment.
Something went wrong with that request. Please try again.