Author: markt
Date: Fri Feb 19 12:25:58 2016
New Revision: 1731235
URL: http://svn.apache.org/viewvc?rev=1731235&view=rev
Log:
Correctly set the state if the encoding can't be read
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1731235&r1=1731234&r2=1731235&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Fri
Feb 19 12:25:58 2016
@@ -1467,14 +1467,13 @@ public abstract class WebappClassLoaderB
state = LifecycleState.STARTING;
- String encoding = null;
try {
- encoding = System.getProperty("file.encoding");
+ String encoding = System.getProperty("file.encoding");
+ if (encoding.indexOf("EBCDIC") != -1) {
+ needConvert = true;
+ }
} catch (SecurityException e) {
- return;
- }
- if (encoding.indexOf("EBCDIC")!=-1) {
- needConvert = true;
+ // Ignore
}
state = LifecycleState.STARTED;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
