From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 Apr 2008 23:07:10 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44380
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ab627b0647504e07350fcb3370ed48d571d6f489;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44380
Don't bother scanning non-file URLs for TLDs.
Patch provided by Florent BENOIT

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@647345 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 9bc209b99..1dde2ec1f 100644
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -679,11 +679,17 @@ public final class TldConfig  {
             if (loader instanceof URLClassLoader) {
                 URL[] urls = ((URLClassLoader) loader).getURLs();
                 for (int i=0; i<urls.length; i++) {
-                    // Expect file URLs, these are %xx encoded or not depending on
-                    // the class loader
+                    // 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
+                    
+                    // Check that the URL is using file protocol, else ignore it
+                    if (!"file".equals(urls[i].getProtocol())) {
+                        continue;
+                    }
+                    
                     File file = null;
                     try {
                         file = new File(urls[i].toURI());