Repository navigation
Commit de44358
committed
Fix ambiguous tryCommitBlockingResponse mock after rebase
Master (#12519) added a default BlockResponseFunction.tryCommitBlockingResponse(RequestContext, RequestBlockingAction)
overload alongside the existing TraceSegment-based one, making bare any()
matchers ambiguous. Disambiguate with any(TraceSegment.class), matching
the overload GlassFishBlockingHelper actually invokes via BlockFailureReporter.1 parent 1be3e57 commit de44358
1 file changed
Lines changed: 4 additions & 2 deletions
File tree
- dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
241 | 241 | | |
242 | 242 | | |
243 | 243 | | |
244 | | - | |
| 244 | + | |
| 245 | + | |
245 | 246 | | |
246 | 247 | | |
247 | 248 | | |
| |||
412 | 413 | | |
413 | 414 | | |
414 | 415 | | |
415 | | - | |
| 416 | + | |
| 417 | + | |
416 | 418 | | |
417 | 419 | | |
418 | 420 | | |
| |||
0 commit comments