Author: markt
Date: Mon Sep 27 22:17:30 2010
New Revision: 1001934
URL: http://svn.apache.org/viewvc?rev=1001934&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1001934&r1=1001933&r2=1001934&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Mon Sep 27
22:17:30 2010
@@ -488,7 +488,9 @@ public class ClassLoaderLogManager exten
} finally {
try {
is.close();
- } catch (Throwable t) {}
+ } catch (IOException ioe) {
+ // Ignore
+ }
}
// Create handlers for the root logger of this classloader
Modified: tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/OneLineFormatter.java?rev=1001934&r1=1001933&r2=1001934&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/OneLineFormatter.java (original)
+++ tomcat/trunk/java/org/apache/juli/OneLineFormatter.java Mon Sep 27 22:17:30
2010
@@ -119,7 +119,7 @@ public class OneLineFormatter extends Fo
int index;
try {
index = Integer.parseInt(month) - 1;
- } catch (Throwable t) {
+ } catch (Exception e) {
index = 0; // Can not happen, in theory
}
return (months[index]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
