Author: dkulp
Date: Thu Apr 7 22:06:24 2011
New Revision: 1090042
URL: http://svn.apache.org/viewvc?rev=1090042&view=rev
Log:
Merged revisions 1090031 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1090031 | dkulp | 2011-04-07 17:39:13 -0400 (Thu, 07 Apr 2011) | 2 lines
[CXF-3171] If the hostname is in the noProxy list, use Proxy.NO_PROXY
instead to make sure the host isn't proxied
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1090042&r1=1090041&r2=1090042&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Thu Apr 7 22:06:24 2011
@@ -1122,7 +1122,7 @@ public class HTTPConduit
Pattern pattern = policy.getNonProxyHosts();
if (pattern.matcher(hostname).matches()) {
// Excluded hostname -> no proxy
- return null;
+ return Proxy.NO_PROXY;
}
}
// Either nonProxyHosts is not set or the pattern did not match
Modified:
cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java?rev=1090042&r1=1090041&r2=1090042&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
Thu Apr 7 22:06:24 2011
@@ -256,7 +256,7 @@ public class HTTPConduitURLEasyMockTest
if (send) {
//proxy = control.createMock(Proxy.class);
- proxy = null;
+ proxy = null;
connection =
control.createMock(HttpURLConnection.class);
connectionFactory.createConnection(
