Skip to content

Commit 1193f6d

Browse files
committed
fix(Interceptors): Ensure backwards compatibility with ColdBox <6
1 parent 6abf196 commit 1193f6d

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

models/HyperRequest.cfc

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,21 +1096,38 @@ component accessors="true" {
10961096
for ( var callback in variables.requestCallbacks ) {
10971097
callback( this );
10981098
}
1099-
variables.interceptorService.announce( "onHyperRequest", { "request" : this } );
1099+
param variables.useAnnounceMethodForInterceptorService = variables.interceptorService.keyExists( "announce" );
1100+
if ( variables.useAnnounceMethodForInterceptorService ) {
1101+
variables.interceptorService.announce( "onHyperRequest", { "request" : this } );
1102+
} else {
1103+
variables.interceptorService.processState( "onHyperRequest", { "request" : this } );
1104+
}
11001105

11011106
try {
11021107
var res = shouldFake() ? generateFakeRequest() : variables.httpClient.send( this );
11031108

11041109
for ( var callback in variables.responseCallbacks ) {
11051110
callback( res );
11061111
}
1107-
variables.interceptorService.announce(
1108-
"onHyperResponse",
1109-
{
1110-
"response" : res,
1111-
"request" : res.getRequest()
1112-
}
1113-
);
1112+
1113+
param variables.useAnnounceMethodForInterceptorService = variables.interceptorService.keyExists( "announce" );
1114+
if ( variables.useAnnounceMethodForInterceptorService ) {
1115+
variables.interceptorService.announce(
1116+
"onHyperResponse",
1117+
{
1118+
"response" : res,
1119+
"request" : res.getRequest()
1120+
}
1121+
);
1122+
} else {
1123+
variables.interceptorService.processState(
1124+
"onHyperResponse",
1125+
{
1126+
"response" : res,
1127+
"request" : res.getRequest()
1128+
}
1129+
);
1130+
}
11141131

11151132
if (
11161133
variables.currentRequestCount <= variables.retries.len() &&

0 commit comments

Comments
 (0)