Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644

Some Throwables must always be re-thrown

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1001934 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index 1fdce3b..5421497 100644 (file)
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -488,7 +488,9 @@ public class ClassLoaderLogManager extends LogManager {
         } finally {
             try {
                 is.close();
-            } catch (Throwable t) {}
+            } catch (IOException ioe) {
+                // Ignore
+            }
         }
         
         // Create handlers for the root logger of this classloader

diff --git a/java/org/apache/juli/OneLineFormatter.java b/java/org/apache/juli/OneLineFormatter.java
index cbbaac5..f7e32c4 100644 (file)
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -119,7 +119,7 @@ public class OneLineFormatter extends Formatter {
         int index;
         try {
             index = Integer.parseInt(month) - 1;
-        } catch (Throwable t) {
+        } catch (Exception e) {
             index = 0;  // Can not happen, in theory
         }
         return (months[index]);