Skip to content

Commit

Permalink
Merge branch 'development' of github.com:coldbox-modules/cbproxies in…
Browse files Browse the repository at this point in the history
…to development
  • Loading branch information
lmajano committed Apr 10, 2024
2 parents 10ce42f + 96bae56 commit 240eab3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions models/BaseProxy.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ component accessors="true" {
if ( variables.isLucee ) {
variables.cfContext = getCFMLContext().getApplicationContext();
variables.pageContext = getCFMLContext();
} else if( variables.isAdobe ) {
} else if ( variables.isAdobe ) {
variables.DataSrcImplStatic = createObject( "java", "coldfusion.sql.DataSrcImpl" );
variables.fusionContextStatic = createObject( "java", "coldfusion.filter.FusionContext" );
variables.originalFusionContext = fusionContextStatic.getCurrent().clone();
Expand Down Expand Up @@ -108,7 +108,7 @@ component accessors="true" {
// Lucee vs Adobe Implementations
if ( variables.isLucee ) {
getCFMLContext().setApplicationContext( variables.cfContext );
} else if( variables.isAdobe ) {
} else if ( variables.isAdobe ) {
// Set the current thread's class loader from the CF space to avoid
// No class defined issues in thread land.
getCurrentThread().setContextClassLoader(
Expand Down Expand Up @@ -167,7 +167,7 @@ component accessors="true" {

try {
// Lucee vs Adobe Implementations
if( variables.isAdobe ) {
if ( variables.isAdobe ) {
// Ensure any DB connections used get returned to the connection pool. Without clearSqlProxy an executor will hold onto any connections it touched while running and they will not timeout/close, and no other code can use the connection except for the executor that last touched it. Credit to Brad Wood for finding this!
variables.DataSrcImplStatic.clearSqlProxy();
variables.fusionContextStatic.setCurrent( javacast( "null", "" ) );
Expand Down Expand Up @@ -201,7 +201,7 @@ component accessors="true" {
* Amend this check once Adobe fixes this in a later update
*/
function getConcurrentEngineLockName(){
if( variables.isAdobe ){
if ( variables.isAdobe ) {
return variables.UUID;
} else {
return createUUID();
Expand Down

0 comments on commit 240eab3

Please sign in to comment.