svn commit: r635165 - /openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java

[db...@apache.org]

Author: dblevins
Date: Sat Mar  8 20:25:27 2008
New Revision: 635165

URL: http://svn.apache.org/viewvc?rev=635165&view=rev
Log:
check for spaces in the URL before it's turned into a URI

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java?rev=635165&r1=635164&r2=635165&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java Sat Mar  8 20:25:27 2008
@@ -21,6 +21,7 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URI;
+import java.net.URLDecoder;
 import java.util.Properties;
 
 public class TomcatEmbedder {
@@ -76,7 +77,13 @@
 
             URL classURL = clazz.getClassLoader().getResource(classFileName);
 
-            URI uri = classURL.toURI();
+            URI uri = null;
+            String url = classURL.toExternalForm();
+            if (url.contains(" ")) {
+                url = url.replaceAll(" ", "%20");
+            }
+            uri = new URI(url);
+
             if (uri.getPath() == null){
                 uri = new URI(uri.getRawSchemeSpecificPart());
             }
@@ -88,7 +95,7 @@
                 path = path.substring(0, path.length() - classFileName.length());
             }
 
-            return new File(path);
+            return new File(URLDecoder.decode(path));
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }