svn commit: r956252 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Jun 19 16:53:36 2010
New Revision: 956252

URL: http://svn.apache.org/viewvc?rev=956252&view=rev
Log:
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.

Modified:
    tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=956252&r1=956251&r2=956252&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sat Jun 
19 16:53:36 2010
@@ -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);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=956252&r1=956251&r2=956252&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Jun 19 16:53:36 2010
@@ -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">



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