You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2015/04/09 00:14:05 UTC
[1/2] cxf git commit: [CXF-6335] Explicitly set HTTPConduit on client
inbound message
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes cfdd73b74 -> 47b248a25
[CXF-6335] Explicitly set HTTPConduit on client inbound message
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/32931253
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/32931253
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/32931253
Branch: refs/heads/3.0.x-fixes
Commit: 32931253741e95e81b9d422daa466f0bc96c8c60
Parents: cfdd73b
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed Apr 8 23:43:56 2015 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed Apr 8 23:47:20 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/cxf/transport/http/HTTPConduit.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/32931253/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 4b9adc1..304f644 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -71,6 +71,7 @@ import org.apache.cxf.policy.PolicyDataEngine;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.AbstractConduit;
import org.apache.cxf.transport.Assertor;
+import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.http.auth.DefaultBasicAuthSupplier;
import org.apache.cxf.transport.http.auth.DigestAuthSupplier;
@@ -1588,6 +1589,7 @@ public abstract class HTTPConduit
inMessage.setExchange(exchange);
updateResponseHeaders(inMessage);
inMessage.put(Message.RESPONSE_CODE, responseCode);
+ propagateConduit(exchange, inMessage);
if (!doProcessResponse(outMessage, responseCode)
|| HttpURLConnection.HTTP_ACCEPTED == responseCode) {
@@ -1645,7 +1647,15 @@ public abstract class HTTPConduit
}
-
+ protected void propagateConduit(Exchange exchange, Message in) {
+ if (exchange != null) {
+ Message out = exchange.getOutMessage();
+ if (out != null) {
+ in.put(Conduit.class, out.get(Conduit.class));
+ }
+ }
+ }
+
protected void handleHttpRetryException(HttpRetryException e) throws IOException {
String msg = "HTTP response '" + e.responseCode() + ": "
+ getResponseMessage() + "' invoking " + url;
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by as...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/47b248a2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/47b248a2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/47b248a2
Branch: refs/heads/3.0.x-fixes
Commit: 47b248a25e4de8f876119fff2c0a3f0dce3bc8de
Parents: 3293125
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed Apr 8 23:47:53 2015 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed Apr 8 23:47:53 2015 +0200
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/47b248a2/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a8843ca..9974b0b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -250,6 +250,7 @@ M 2b4fe9966c46457177f6412525c57c64d07dbe69
M 2d3ac551c8614516cbbf288195d2a99cadb79659
M 3af7c785c642db6ae64276f92fb05450d7f9aba3
M 3d3d495a2c58164abfb54b64208b3f72b4d235dd
+M 40a8c9247e0829ecac38764cf4b27d1e0102f7b3
M 40c6734f96ca0a3d82eb37088f43221e93cbd6f2
M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
M 4640cf1ea20eee09ae650b706bce765a16affc8b