cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r921942 - /cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Date Thu, 11 Mar 2010 17:11:30 GMT
Author: dkulp
Date: Thu Mar 11 17:11:30 2010
New Revision: 921942

URL: http://svn.apache.org/viewvc?rev=921942&view=rev
Log:
[CXF-2703] More issues with spaces in wsdl/jar locations
Patch from Craig Tataryn applied

Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=921942&r1=921941&r2=921942&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Thu Mar
11 17:11:30 2010
@@ -291,17 +291,28 @@ public class URIResolver {
             try {
                 uri = url.toURI();
             } catch (URISyntaxException e) {
-                // processing the jar:file:/ type value
-                String urlStr = url.toString();
-                if (urlStr.startsWith("jar:") 
-                    || urlStr.startsWith("zip:")
-                    || urlStr.startsWith("wsjar:")) {
-                    int pos = urlStr.indexOf('!');
-                    if (pos != -1) {
-                        try {
-                            uri = new URI("classpath:" + urlStr.substring(pos + 1));
-                        } catch (URISyntaxException ue) {
-                            // ignore
+                // yep, some versions of the JDK can't handle spaces when URL.toURI() is
called, and lots of people
+                // on windows have their maven repositories at C:/Documents and Settings/<userid>/.m2/repository
+                // re: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6506304
+                if (url.toString().contains(" ")) {
+                    url = new URL(url.toString().replace(" ", "%20"));
+                }
+                //let's try this again
+                try {
+                    uri = url.toURI();
+                } catch (URISyntaxException e1) {
+                    // processing the jar:file:/ type value
+                    String urlStr = url.toString();
+                    if (urlStr.startsWith("jar:")
+                        || urlStr.startsWith("zip:")
+                        || urlStr.startsWith("wsjar:")) {
+                        int pos = urlStr.indexOf('!');
+                        if (pos != -1) {
+                            try {
+                                uri = new URI("classpath:" + urlStr.substring(pos + 1));
+                            } catch (URISyntaxException ue) {
+                                // ignore
+                            }
                         }
                     }
                 }



Mime
View raw message