cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1090031 - in /cxf/trunk/rt/transports/http/src: main/java/org/apache/cxf/transport/http/ProxyFactory.java test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
Date Thu, 07 Apr 2011 21:39:13 GMT
Author: dkulp
Date: Thu Apr  7 21:39:13 2011
New Revision: 1090031

URL: http://svn.apache.org/viewvc?rev=1090031&view=rev
Log:
[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/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ProxyFactory.java
    cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ProxyFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ProxyFactory.java?rev=1090031&r1=1090030&r2=1090031&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ProxyFactory.java
(original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ProxyFactory.java
Thu Apr  7 21:39:13 2011
@@ -127,7 +127,7 @@ public class ProxyFactory {
             Pattern pattern = PatternBuilder.build(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/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java?rev=1090031&r1=1090030&r2=1090031&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
(original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLEasyMockTest.java
Thu Apr  7 21:39:13 2011
@@ -252,7 +252,7 @@ public class HTTPConduitURLEasyMockTest 
         
         if (send) {
             //proxy = control.createMock(Proxy.class);
-            proxy =  null;
+            proxy = null;
             connection =
                 control.createMock(HttpURLConnection.class);
             connectionFactory.createConnection((TLSClientParameters)EasyMock.isNull(),



Mime
View raw message