Author: dkulp
Date: Thu Apr  7 22:07:18 2011
New Revision: 1090045

URL: http://svn.apache.org/viewvc?rev=1090045&view=rev
Log:
Merged revisions 1090032 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1090032 | dkulp | 2011-04-07 17:39:20 -0400 (Thu, 07 Apr 2011) | 1 line
  
  [CXF-3204] Use proper URI constructor that can handle spaces in paths
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java

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

Modified: 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1090045&r1=1090044&r2=1090045&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
 Thu Apr  7 22:07:18 2011
@@ -512,11 +512,13 @@ public class DynamicClientFactory {
                 for (URL url : urls) {
                     if (url.getProtocol().startsWith("file")) {
                         File file;
-                        if (url.toURI().getPath() == null) {
-                            continue;
-                        }
                         try { 
-                            file = new File(url.toURI().getPath()); 
+                            URI uri = new URI(url.getProtocol(), null, 
url.getPath(), null, null);
+
+                            if (uri.getPath() == null) {
+                                continue;
+                            }
+                            file = new File(uri.getPath()); 
                         } catch (URISyntaxException urise) { 
                             if (url.getPath() == null) {
                                 continue;


Reply via email to