geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r525561 - /geronimo/server/trunk/modules/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Date Wed, 04 Apr 2007 17:31:16 GMT
Author: jbohn
Date: Wed Apr  4 10:31:15 2007
New Revision: 525561

URL: http://svn.apache.org/viewvc?view=rev&rev=525561
Log:
GERONIMO-3056 - clean up WARNING messages on JARS - thanks Jay McHugh!

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=525561&r1=525560&r2=525561
==============================================================================
--- 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
Wed Apr  4 10:31:15 2007
@@ -360,14 +360,16 @@
                     URL urlJC = jarConnection.getJarFileURL();
                     URI baseURI = new URI(urlJC.toString().replaceAll(" ", "%20"));
                     directory = new File(baseURI);
-                    if (directory.isDirectory() && directory.canRead()) {
-                        JarFile temp = new JarFile(directory);
-                        List<URL> tempURLs = scanJAR(temp, "META-INF");
-                        for (URL jarURL : tempURLs) {
-                            dirURLs.add(jarURL);
+                    if (directory.isDirectory()) {
+                        if (directory.canRead()) {
+                            JarFile temp = new JarFile(directory);
+                            List<URL> tempURLs = scanJAR(temp, "META-INF");
+                            for (URL jarURL : tempURLs) {
+                                dirURLs.add(jarURL);
+                            }
+                        } else {
+                            log.warn("Cannot read JAR file: " + url.toString());
                         }
-                    } else {
-                        log.warn("Cannot read JAR file: " + url.toString());
                     }
                 }
                 catch (Exception e) {



Mime
View raw message