Return-Path: 
 <dev-return-80624-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 34649 invoked from network); 24 Apr 2007 13:42:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 24 Apr 2007 13:42:34 -0000
Received: (qmail 6655 invoked by uid 500); 24 Apr 2007 13:42:36 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 6605 invoked by uid 500); 24 Apr 2007 13:42:36 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 6594 invoked by uid 500); 24 Apr 2007 13:42:36 -0000
Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org
Received: (qmail 6591 invoked by uid 99); 24 Apr 2007 13:42:36 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Apr 2007 06:42:36 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Apr 2007 06:42:28 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9CAB01A9838; Tue, 24 Apr 2007 06:42:08 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r531938 -
 /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
Date: Tue, 24 Apr 2007 13:42:08 -0000
To: tomcat-dev@jakarta.apache.org
From: remm@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070424134208.9CAB01A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: remm
Date: Tue Apr 24 06:42:07 2007
New Revision: 531938

URL: http://svn.apache.org/viewvc?view=rev&rev=531938
Log:
- 42202: Fix a problem handling %xx encoded URLs (unfortunately, some are encoded - the webapp CL and the system CL -
  and some are not - the URL CL).

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?view=diff&rev=531938&r1=531937&r2=531938
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Tue Apr 24 06:42:07 2007
@@ -26,6 +26,7 @@
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -427,8 +428,18 @@
                                               resourcePath));
         }
 
-        File file = new File(url.getFile());
-        file = file.getCanonicalFile();
+        File file = null;
+        try {
+            file = new File(url.toURI());
+        } catch (URISyntaxException e) {
+            // Ignore, probably an unencoded char
+            file = new File(url.getFile());
+        }
+        try {
+            file = file.getCanonicalFile();
+        } catch (IOException e) {
+            // Ignore
+        }
         tldScanJar(file);
 
     }
@@ -674,11 +685,18 @@
             if (loader instanceof URLClassLoader) {
                 URL[] urls = ((URLClassLoader) loader).getURLs();
                 for (int i=0; i<urls.length; i++) {
-                    // Expect file URLs
+                    // Expect file URLs, these are %xx encoded or not depending on
+                    // the class loader
                     // This is definitely not as clean as using JAR URLs either
                     // over file or the custom jndi handler, but a lot less
                     // buggy overall
-                    File file = new File(urls[i].getFile());
+                    File file = null;
+                    try {
+                        file = new File(urls[i].toURI());
+                    } catch (URISyntaxException e) {
+                        // Ignore, probably an unencoded char
+                        file = new File(urls[i].getFile());
+                    }
                     try {
                         file = file.getCanonicalFile();
                     } catch (IOException e) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org