cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r789529 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Date Tue, 30 Jun 2009 01:24:50 GMT
Author: dkulp
Date: Tue Jun 30 01:24:50 2009
New Revision: 789529

URL: http://svn.apache.org/viewvc?rev=789529&view=rev
Log:
[CXF-2113] Make Conduit check the ProxyServer name for empty so it can
be "unconfigured" via spring.

Modified:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=789529&r1=789528&r2=789529&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Tue Jun 30 01:24:50 2009
@@ -46,6 +46,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.Configurable;
 import org.apache.cxf.configuration.jsse.TLSClientParameters;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
@@ -1082,7 +1083,9 @@
      */
     private Proxy getProxy(HTTPClientPolicy policy) {
         Proxy proxy = null; 
-        if (policy != null && policy.isSetProxyServer()) {
+        if (policy != null 
+            && policy.isSetProxyServer()
+            && !StringUtils.isEmpty(policy.getProxyServer())) {
             proxy = new Proxy(
                     Proxy.Type.valueOf(policy.getProxyServerType().toString()),
                     new InetSocketAddress(policy.getProxyServer(),



Mime
View raw message