Repository: cxf Updated Branches: refs/heads/master 6031e2eb4 -> 1d67c14d4
[CXF-7112,CXF-7109] Make sure to remove ClientCallback from exchange when invoking handleException() Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1d67c14d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1d67c14d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1d67c14d Branch: refs/heads/master Commit: 1d67c14d413c0ead5daa3ac5d1a0e5e8ad3145ec Parents: 6031e2e Author: Tadayoshi Sato <[email protected]> Authored: Sun Oct 30 17:07:40 2016 +0900 Committer: Tadayoshi Sato <[email protected]> Committed: Sun Oct 30 17:07:40 2016 +0900 ---------------------------------------------------------------------- .../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1d67c14d/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java index bada797..0ebcb81 100644 --- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java +++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java @@ -872,7 +872,8 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit { } Exchange exchange = outMessage.getExchange(); - ClientCallback cc = exchange.get(ClientCallback.class); + // remove callback so that it won't be invoked twice + ClientCallback cc = exchange.remove(ClientCallback.class); if (cc != null) { cc.handleException(null, new SocketTimeoutException()); }
