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

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 642ed04..85ccaab 100644 (file)
--- 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 7b6723b..fb337fe 100644 (file)
--- 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>