cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1406958 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
Date Thu, 08 Nov 2012 08:48:30 GMT
Author: ffang
Date: Thu Nov  8 08:48:30 2012
New Revision: 1406958

URL: http://svn.apache.org/viewvc?rev=1406958&view=rev
Log:
[CXF-4620]Exception at compilation when a 'space' character is present in maven local repository
path

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java?rev=1406958&r1=1406957&r2=1406958&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java Thu Nov
 8 08:48:30 2012
@@ -144,15 +144,15 @@ public class OASISCatalogManager {
         Enumeration<URL> catalogs = classLoader.getResources(name);
         while (catalogs.hasMoreElements()) {
             URL catalogURL = catalogs.nextElement();
-            if (!loadedCatalogs.contains(URI.create(catalogURL.toString()))) {
+            if (!loadedCatalogs.contains(URI.create(replaceWhitespace(catalogURL.toString()))))
{
                 ((Catalog)catalog).parseCatalog(catalogURL);
-                loadedCatalogs.add(URI.create(catalogURL.toString()));
+                loadedCatalogs.add(URI.create(replaceWhitespace(catalogURL.toString())));
             }
         }
     }
 
     public final void loadCatalog(URL catalogURL) throws IOException {
-        if (!loadedCatalogs.contains(URI.create(catalogURL.toString())) && catalog
!= null) {
+        if (!loadedCatalogs.contains(URI.create(replaceWhitespace(catalogURL.toString())))
&& catalog != null) {
             if ("file".equals(catalogURL.getProtocol())) {
                 try {
                     File file = new File(catalogURL.toURI());
@@ -166,9 +166,16 @@ public class OASISCatalogManager {
 
             ((Catalog)catalog).parseCatalog(catalogURL);
 
-            loadedCatalogs.add(URI.create(catalogURL.toString()));
+            loadedCatalogs.add(URI.create(replaceWhitespace(catalogURL.toString())));
         }
     }
+    
+    private String replaceWhitespace(String str) {
+        if (str.contains(" ")) {
+            str = str.replace(" ", "%20");
+        }
+        return str;
+    }
 
     private static OASISCatalogManager getContextCatalog() {
         try {



Mime
View raw message