AdobeServerScope Breaks Coldbox

Author: lmajano

system/Bootstrap.cfc

@@ -717,36 +717,36 @@ component serializable="false" accessors="true" {
 		required encoding
 	){
 		// Status Codes
-		getPageContextResponse().setStatus( arguments.statusCode );
+		getPageContextResponse().setStatus( arguments.statusCode )
 		// Render the Data Content Type
 		controller
 			.getDataMarshaller()
 			.renderContent(
-				type     = arguments.contentType,
-				encoding = arguments.encoding,
-				reset    = true
-			);
-		return this;
+				type     : arguments.contentType,
+				encoding : arguments.encoding,
+				reset    : true
+			)
+		return this
 	}
 
 	/**
 	 * Locate the application key
 	 */
 	private function locateAppKey(){
 		if ( len( trim( variables.COLDBOX_APP_KEY ) ) ) {
-			return variables.COLDBOX_APP_KEY;
+			return variables.COLDBOX_APP_KEY
 		}
-		return "cbController";
+		return "cbController"
 	}
 
 	/**
 	 * Helper method to deal with ACF's overload of the page context response, come on Adobe, get your act together!
 	 */
 	private function getPageContextResponse(){
-		if ( server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" ) ) {
-			return getPageContext().getResponse().getResponse();
+		if( server.keyExists( "boxlang" ) || server.keyExists( "lucee" ) ) {
+			return getPageContext().getResponse()
 		}
-		return getPageContext().getResponse();
+		return getPageContext().getResponse().getResponse()
 	}
 
 }

tests/resources/BaseIntegrationTest.cfc

@@ -61,32 +61,35 @@ component
 	 * @beforeEach
 	 */
 	function cleanupColdBoxRequestData(){
-		structDelete( request, "_lastInvalidEvent" );
+		structDelete( request, "_lastInvalidEvent" )
 		structDelete( request, "cbTransientDICache" )
 	}
 
 	function isAdobe(){
-		return server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" );
+		if( isLucee() || isBoxLang() ){
+			return false
+		}
+		return server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" )
 	}
 
 	function isLucee(){
-		return server.keyExists( "lucee" );
+		return server.keyExists( "lucee" )
 	}
 
 	function isBoxLang(){
-		return server.keyExists( "boxlang" );
+		return server.keyExists( "boxlang" )
 	}
 
 	function isLucee6(){
-		return server.keyExists( "lucee" ) && left( server.lucee.version, 1 ) == 6;
+		return server.keyExists( "lucee" ) && left( server.lucee.version, 1 ) == 6
 	}
 
 	function noWSDLSupport(){
-		return isAdobe() || isLucee6() || isBoxLang();
+		return isAdobe() || isLucee6() || isBoxLang()
 	}
 
 	function shutdownColdBox(){
-		getColdBoxVirtualApp().shutdown();
+		getColdBoxVirtualApp().shutdown()
 	}
 
 }