From 1535755c49ffaee8fd65e8fcac7bf50ae7df77e2 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 14 Jul 2010 21:35:37 +0000
Subject: [PATCH] Fxi https://issues.apache.org/bugzilla/show_bug.cgi?id=49128
 Don't swallow exceptions unnecessarily

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@964215 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/loader/WebappClassLoader.java | 2 +-
 webapps/docs/changelog.xml                             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 642ed0403..85ccaab48 100644
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -1811,7 +1811,7 @@ public class WebappClassLoader
         String encoding = null;
         try {
             encoding = System.getProperty("file.encoding");
-        } catch (Exception e) {
+        } catch (SecurityException e) {
             return;
         }
         if (encoding.indexOf("EBCDIC")!=-1) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7b6723bbf..fb337fe26 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,10 @@
         one of them fails, do not ignore the others. (markt/kkolinko)
       </fix>
       <fix>
+        <bug>49128</bug>: Don't swallow exceptions unnecessarily in
+        <code>WebappClassLoader.start()</code>. (markt)
+      </fix>
+      <fix>
         <bug>49182</bug>: Align comments in setclasspath.[sh|bat] with
         behaviour. Based on a patch provided by sebb. (markt)
       </fix>
-- 
2.11.0