Author: dkulp
Date: Thu Jan 15 12:34:44 2009
New Revision: 734812

URL: http://svn.apache.org/viewvc?rev=734812&view=rev
Log:
Fix for redirects from http <---> https

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=734812&r1=734811&r2=734812&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
 Thu Jan 15 12:34:44 2009
@@ -1597,9 +1597,14 @@
         // Disconnect the old, and in with the new.
         connection.disconnect();
         
-        connection = 
+        if (connectionFactory.getProtocol().equals(newURL.getProtocol())) {
+            connection = 
                 connectionFactory.createConnection(
-                          getProxy(clientSidePolicy), newURL);
+                          getProxy(clientSidePolicy), newURL);            
+        } else {
+            connection = 
AbstractHTTPTransportFactory.getConnectionFactory(this, newURL.toString())
+                .createConnection(getProxy(clientSidePolicy), newURL);
+        }
 
         connection.setDoOutput(true);        
         // TODO: using Message context to deceided HTTP send properties        


Reply via email to