cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1461311 - /cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
Date Tue, 26 Mar 2013 20:53:27 GMT
Author: dkulp
Date: Tue Mar 26 20:53:26 2013
New Revision: 1461311

URL: http://svn.apache.org/r1461311
Log:
Merged revisions 1461293 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1461293 | dkulp | 2013-03-26 16:05:09 -0400 (Tue, 26 Mar 2013) | 10 lines

  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.6.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=1461311&r1=1461310&r2=1461311&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
(original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
Tue Mar 26 20:53:26 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;
                 }



Mime
View raw message