Author: markt
Date: Mon May 28 21:43:31 2012
New Revision: 1343400

URL: http://svn.apache.org/viewvc?rev=1343400&view=rev
Log:
Better error message if a ClassFormatException is encountered during
annotation scanning and do not fail to start the web app in that case.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

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=1343400&r1=1343399&r2=1343400&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon May 28 
21:43:31 2012
@@ -1854,6 +1854,9 @@ public class ContextConfig implements Li
                     } catch (IOException e) {
                         log.error(sm.getString("contextConfig.inputStreamJar",
                                 entryName, url),e);
+                    } catch (ClassFormatException e) {
+                        log.error(sm.getString("contextConfig.inputStreamJar",
+                                entryName, url),e);
                     } finally {
                         if (is != null) {
                             try {
@@ -1910,6 +1913,9 @@ public class ContextConfig implements Li
                     } catch (IOException e) {
                         log.error(sm.getString("contextConfig.inputStreamJndi",
                                 url),e);
+                    } catch (ClassFormatException e) {
+                        log.error(sm.getString("contextConfig.inputStreamJndi",
+                                url),e);
                     } finally {
                         if (is != null) {
                             try {
@@ -1942,6 +1948,9 @@ public class ContextConfig implements Li
             } catch (IOException e) {
                 log.error(sm.getString("contextConfig.inputStreamFile",
                         file.getAbsolutePath()),e);
+            } catch (ClassFormatException e) {
+                log.error(sm.getString("contextConfig.inputStreamFile",
+                        file.getAbsolutePath()),e);
             } finally {
                 if (fis != null) {
                     try {



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

Reply via email to