You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/07/31 19:08:44 UTC

svn commit: r1152595 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml

Author: markt
Date: Sun Jul 31 17:08:43 2011
New Revision: 1152595

URL: http://svn.apache.org/viewvc?rev=1152595&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51586
Expand error handling to cover anything that is recoverable (or might be recoverable) when loading classes during HandlesTypes processing.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1152595&r1=1152594&r2=1152595&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sun Jul 31 17:08:43 2011
@@ -2016,6 +2016,11 @@ public class ContextConfig
             log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
                     className), e);
             return;
+        } catch (Throwable t) {
+            ExceptionUtils.handleThrowable(t);
+            log.warn(sm.getString("contextConfig.invalidSciHandlesTypes",
+                    className), t);
+            return;
         }
 
         if (clazz.isAnnotation()) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1152595&r1=1152594&r2=1152595&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Jul 31 17:08:43 2011
@@ -100,6 +100,11 @@
         to/from URLs when working with resources from a Context so special
         characters don't cause issues. (markt)
       </fix>
+      <fix>
+        <bug>51586</bug>: Expand error handling to cover anything that is
+        recoverable (or might be recoverable) when loading classes during
+        HandlesTypes processing. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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