Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "removal of testing if inited, as wirebox creates everything n…

…ow."

This reverts commit 2edd0fb
  • Loading branch information...
commit 30e586ae12adb32c953099e8aca20b4e4066dcfb 1 parent 2edd0fb
@lmajano lmajano authored
View
5 system/web/services/InterceptorService.cfc
@@ -115,6 +115,11 @@ Description :
<!--- ************************************************************* --->
<cfset var timerHash = 0><cfsilent>
<cfscript>
+ // Is ColdBox Inited and ready to serve requests?
+ if ( NOT controller.getColdboxInitiated() ){
+ return this;
+ }
+
// Validate Incoming State
if ( instance.interceptorConfig.throwOnInvalidStates AND NOT listFindNoCase(arrayToList( instance.interceptionPoints ), arguments.state)){
getUtil().throwit("The interception state sent in to process is not valid: #arguments.state#","Valid states are #instance.interceptionPoints.toString()#","InterceptorService.InvalidInterceptionState");
View
2  system/web/services/PluginService.cfc
@@ -90,7 +90,7 @@ Modification History:
var iData = {};
// listen to plugins only
- if( structKeyExists(attribs, "isPlugin") ){
+ if( controller.getColdboxInitiated() AND structKeyExists(attribs, "isPlugin") ){
//Fill-up Intercepted MetaData
iData.pluginPath = attribs.pluginPath;
iData.custom = attribs.custom;
Please sign in to comment.
Something went wrong with that request. Please try again.