From 9f2fd4416174dd231377a6b6ac621c55e5774972 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 27 Sep 2010 22:17:30 +0000 Subject: [PATCH] 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 --- java/org/apache/juli/ClassLoaderLogManager.java | 4 +++- java/org/apache/juli/OneLineFormatter.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java index 1fdce3beb..542149792 100644 --- 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 cbbaac50c..f7e32c43e 100644 --- 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]); -- 2.11.0