cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [1/2] git commit: [CXF-5836] Fix NPE when nonProxyHosts is used Patch from Nicolas Sprauel applied
Date Tue, 01 Jul 2014 19:25:05 GMT
Repository: cxf
Updated Branches:
  refs/heads/master d40ea830b -> 7fab676dc


[CXF-5836] Fix NPE when nonProxyHosts is used
Patch from Nicolas Sprauel applied


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0fdde9e2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0fdde9e2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0fdde9e2

Branch: refs/heads/master
Commit: 0fdde9e2b7057328a71c978a0b1727a80a8078db
Parents: d40ea83
Author: Daniel Kulp <dkulp@apache.org>
Authored: Tue Jul 1 14:53:05 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Tue Jul 1 14:53:05 2014 -0400

----------------------------------------------------------------------
 .../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0fdde9e2/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 a7e7dcc..d1d6abd 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
@@ -217,7 +217,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
             .setSocketTimeout((int) csPolicy.getReceiveTimeout())
             .setConnectTimeout((int) csPolicy.getConnectionTimeout());
         Proxy p = proxyFactory.createProxy(csPolicy , uri);
-        if (p != null) {
+        if (p != null && p.type() != Proxy.Type.DIRECT) {
             InetSocketAddress isa = (InetSocketAddress)p.address();
             HttpHost proxy = new HttpHost(isa.getHostName(), isa.getPort());
             b.setProxy(proxy);


Mime
View raw message