cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1467935 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
Date Mon, 15 Apr 2013 11:00:32 GMT
Author: sergeyb
Date: Mon Apr 15 11:00:31 2013
New Revision: 1467935

URL: http://svn.apache.org/r1467935
Log:
Merged revisions 1467934 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1467934 | sergeyb | 2013-04-15 11:45:13 +0100 (Mon, 15 Apr 2013) | 16 lines
  
  Merged revisions 1467931 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ................
    r1467931 | sergeyb | 2013-04-15 11:41:43 +0100 (Mon, 15 Apr 2013) | 9 lines
    
    Merged revisions 1466940 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1466940 | sergeyb | 2013-04-11 17:21:13 +0100 (Thu, 11 Apr 2013) | 1 line
      
      [CXF-4946] Using a specific URL constructor to resolve the relative references with
parent segments
    ........
  ................
................

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1467931
  Merged /cxf/trunk:r1466940
  Merged /cxf/branches/2.6.x-fixes:r1467934

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java?rev=1467935&r1=1467934&r2=1467935&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
Mon Apr 15 11:00:31 2013
@@ -1326,7 +1326,11 @@ public class SourceGenerator {
                     if  (!href.startsWith("/") && !href.contains("..")) {
                         schemaURI = baseWadlPath + href;
                     } else {
-                        schemaURI = URI.create(baseWadlPath).resolve(href).toString();
+                        try {
+                            schemaURI = new URL(new URL(baseWadlPath), href).toString();
+                        } catch (Exception ex) {
+                            schemaURI = URI.create(baseWadlPath).resolve(href).toString();
+                        }
                     }
                 } else {
                     schemaURI = href;



Mime
View raw message