From ccb8dbd4d9f1faa43d8db622119332d1a4b6a2ca Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 19 Jun 2010 16:53:36 +0000
Subject: [PATCH] When using a Loader configured with
 searchExternalFirst="true" failure to find the class in an external
 repository should not prevent searching of the local repositories.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@956252 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/loader/WebappClassLoader.java | 2 ++
 webapps/docs/changelog.xml                             | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 74388df4c..ccd92054a 100644
--- 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 31de2776f..a1e41bb9b 100644
--- 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">
-- 
2.11.0