You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/03/26 21:05:10 UTC
svn commit: r1461293 - in /cxf/branches/2.7.x-fixes:
api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Author: dkulp
Date: Tue Mar 26 20:05:09 2013
New Revision: 1461293
URL: http://svn.apache.org/r1461293
Log:
Merged revisions 1461287 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1461287 | dkulp | 2013-03-26 15:53:53 -0400 (Tue, 26 Mar 2013) | 2 lines
[CXF-4918] Try to detect a redirect (if enabled) and set the appropriate URL
........
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=1461293&r1=1461292&r2=1461293&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java Tue Mar 26 20:05:09 2013
@@ -129,9 +129,13 @@ public class TransportURIResolver extend
InputStream ins = exch.get(InputStream.class);
resourceOpened.addElement(ins);
InputSource src = new InputSource(ins);
- src.setPublicId(base.toString());
- src.setSystemId(base.toString());
- lastestImportUri = base.toString();
+ String u = (String)message.get("http.retransmit.url");
+ if (u == null) {
+ u = base.toString();
+ }
+ src.setPublicId(u);
+ src.setSystemId(u);
+ lastestImportUri = u;
currentResolver.unresolve();
return src;
}
Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1461293&r1=1461292&r2=1461293&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Tue Mar 26 20:05:09 2013
@@ -1187,7 +1187,7 @@ public abstract class HTTPConduit
protected void retransmit(String newURL) throws IOException {
setupNewConnection(newURL);
-
+ outMessage.put("http.retransmit.url", newURL);
if (cachedStream != null && cachedStream.size() < Integer.MAX_VALUE) {
setFixedLengthStreamingMode((int)cachedStream.size());
}