Author: davsclaus
Date: Mon May  9 12:13:58 2011
New Revision: 1100975

URL: http://svn.apache.org/viewvc?rev=1100975&view=rev
Log:
CAMEL-3942: Fixed issue with loading type converters on windows with spaces in 
paths. Thanks to Jean Delmas for the patch.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=1100975&r1=1100974&r2=1100975&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
 Mon May  9 12:13:58 2011
@@ -20,8 +20,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -57,7 +55,7 @@ public class AnnotationTypeConverterLoad
     private static final transient Logger LOG = 
LoggerFactory.getLogger(AnnotationTypeConverterLoader.class);
     protected PackageScanClassResolver resolver;
     protected Set<Class<?>> visitedClasses = new HashSet<Class<?>>();
-    protected Set<URI> visitedURIs = new HashSet<URI>();
+    protected Set<String> visitedURIs = new HashSet<String>();
 
     public AnnotationTypeConverterLoader(PackageScanClassResolver resolver) {
         this.resolver = resolver;
@@ -109,9 +107,8 @@ public class AnnotationTypeConverterLoad
      *
      * @return a collection of packages to search for
      * @throws IOException is thrown for IO related errors
-     * @throws URISyntaxException 
      */
-    protected String[] findPackageNames() throws IOException, 
URISyntaxException {
+    protected String[] findPackageNames() throws IOException {
         Set<String> packages = new HashSet<String>();
         ClassLoader ccl = Thread.currentThread().getContextClassLoader();
         if (ccl != null) {
@@ -121,14 +118,14 @@ public class AnnotationTypeConverterLoad
         return packages.toArray(new String[packages.size()]);
     }
 
-    protected void findPackages(Set<String> packages, ClassLoader classLoader) 
throws IOException, URISyntaxException {
+    protected void findPackages(Set<String> packages, ClassLoader classLoader) 
throws IOException {
         Enumeration<URL> resources = 
classLoader.getResources(META_INF_SERVICES);
         while (resources.hasMoreElements()) {
             URL url = resources.nextElement();
-            URI uri = url.toURI();
-            if (!visitedURIs.contains(uri)) {
+            String path = url.getPath();
+            if (!visitedURIs.contains(path)) {
                 // remember we have visited this uri so we wont read it twice
-                visitedURIs.add(uri);
+                visitedURIs.add(path);
                 LOG.info("Loading file {} to retrieve list of packages, from 
url: {}", META_INF_SERVICES, url);
                 BufferedReader reader = new BufferedReader(new 
InputStreamReader(url.openStream()));
                 try {

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java?rev=1100975&r1=1100974&r2=1100975&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterLoader.java
 Mon May  9 12:13:58 2011
@@ -32,7 +32,7 @@ public class CoreTypeConverterLoader ext
     }
 
     @Override
-    protected String[] findPackageNames() throws IOException, 
URISyntaxException {
+    protected String[] findPackageNames() throws IOException {
         return new String[]{"org.apache.camel.converter", 
"org.apache.camel.component.bean", "org.apache.camel.component.file"};
     }
 


Reply via email to