When using a Loader configured with searchExternalFirst="true" failure to find the...

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

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 74388df..ccd9205 100644 (file)
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -1122,6 +1122,8 @@ public class WebappClassLoader
             if (hasExternalRepositories && searchExternalFirst) {
                 try {
                     clazz = super.findClass(name);
+                } catch(ClassNotFoundException cnfe) {
+                    // Ignore - will search internal repositories next
                 } catch(AccessControlException ace) {
                     log.warn("WebappClassLoader.findClassInternal(" + name
                             + ") security exception: " + ace.getMessage(), ace);

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 31de277..a1e41bb 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -46,6 +46,12 @@
         package definition restrictions defined in the catalina.properties file.
         (markt)
       </fix>
+      <fix>
+        When using a Loader configured with
+        <code>searchExternalFirst=&quot;true&quot;</code> failure to find the
+        class in an external repository should not prevent searching of the
+        local repositories. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">