geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r522896 - /geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Date Tue, 27 Mar 2007 13:08:13 GMT
Author: kevan
Date: Tue Mar 27 06:08:12 2007
New Revision: 522896

URL: http://svn.apache.org/viewvc?view=rev&rev=522896
Log:
GERONIMO-3024 Committing patch supplied by Tim McConnell. Thanks Tim! Convert blank char to
%20 when constructing URI

Modified:
    geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java

Modified: geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?view=diff&rev=522896&r1=522895&r2=522896
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Tue Mar 27 06:08:12 2007
@@ -358,10 +358,9 @@
                 try {
                     JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
                     URL urlJC = jarConnection.getJarFileURL();
-
-                    URI baseURI = new URI(urlJC.toString());
+                    URI baseURI = new URI(urlJC.toString().replaceAll(" ", "%20"));
                     directory = new File(baseURI);
-                    if (directory.canRead()) {
+                    if (directory.isDirectory() && directory.canRead()) {
                         JarFile temp = new JarFile(directory);
                         List<URL> tempURLs = scanJAR(temp, "META-INF");
                         for (URL jarURL : tempURLs) {
@@ -376,7 +375,7 @@
                 }
             } else if (url.toString().startsWith("file:")) {
                 try {
-                    URI baseURI = new URI(url.toString());
+                    URI baseURI = new URI(url.toString().replaceAll(" ", "%20"));
                     directory = new File(baseURI);
                     if (directory.isDirectory() && directory.canRead()) {
                         File[] children = directory.listFiles();



Mime
View raw message