You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2014/06/12 16:52:34 UTC
svn commit: r1602188 -
/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: remm
Date: Thu Jun 12 14:52:33 2014
New Revision: 1602188
URL: http://svn.apache.org/r1602188
Log:
Partial revert to upgrade messages to warn.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1602188&r1=1602187&r2=1602188&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Jun 12 14:52:33 2014
@@ -1633,14 +1633,14 @@ public class WebappClassLoader extends U
List<String> driverNames = (List<String>) obj.getClass().getMethod(
"clearJdbcDriverRegistrations").invoke(obj);
for (String name : driverNames) {
- log.info(sm.getString("webappClassLoader.clearJdbc",
+ log.warn(sm.getString("webappClassLoader.clearJdbc",
getContextName(), name));
}
} catch (Exception e) {
// So many things to go wrong above...
Throwable t = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(t);
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.jdbcRemoveFailed", getContextName()), t);
}
}
@@ -1820,10 +1820,10 @@ public class WebappClassLoader extends U
}
if (isRequestThread(thread)) {
- log.info(sm.getString("webappClassLoader.stackTraceRequestThread",
+ log.warn(sm.getString("webappClassLoader.stackTraceRequestThread",
getContextName(), threadName, getStackTrace(thread)));
} else {
- log.info(sm.getString("webappClassLoader.stackTrace",
+ log.warn(sm.getString("webappClassLoader.stackTrace",
getContextName(), threadName, getStackTrace(thread)));
}
@@ -1999,14 +1999,14 @@ public class WebappClassLoader extends U
}
}
- log.info(sm.getString("webappClassLoader.warnTimerThread",
+ log.warn(sm.getString("webappClassLoader.warnTimerThread",
getContextName(), thread.getName()));
} catch (Exception e) {
// So many things to go wrong above...
Throwable t = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(t);
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.stopTimerThreadFail",
thread.getName(), getContextName()), t);
}
@@ -2053,7 +2053,7 @@ public class WebappClassLoader extends U
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.checkThreadLocalsForLeaksFail",
getContextName()), t);
}
@@ -2096,7 +2096,7 @@ public class WebappClassLoader extends U
try {
args[2] = key.toString();
} catch (Exception e) {
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.checkThreadLocalsForLeaks.badKey",
args[1]), e);
args[2] = sm.getString(
@@ -2108,7 +2108,7 @@ public class WebappClassLoader extends U
try {
args[4] = value.toString();
} catch (Exception e) {
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.checkThreadLocalsForLeaks.badValue",
args[3]), e);
args[4] = sm.getString(
@@ -2122,7 +2122,7 @@ public class WebappClassLoader extends U
args));
}
} else {
- log.info(sm.getString(
+ log.error(sm.getString(
"webappClassLoader.checkThreadLocalsForLeaks",
args));
}
@@ -2286,16 +2286,16 @@ public class WebappClassLoader extends U
log.info(sm.getString("webappClassLoader.clearRmiInfo",
getContextName()), e);
} catch (SecurityException e) {
- log.info(sm.getString("webappClassLoader.clearRmiFail",
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
getContextName()), e);
} catch (NoSuchFieldException e) {
- log.info(sm.getString("webappClassLoader.clearRmiFail",
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
getContextName()), e);
} catch (IllegalArgumentException e) {
- log.info(sm.getString("webappClassLoader.clearRmiFail",
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
getContextName()), e);
} catch (IllegalAccessException e) {
- log.info(sm.getString("webappClassLoader.clearRmiFail",
+ log.warn(sm.getString("webappClassLoader.clearRmiFail",
getContextName()), e);
}
}
@@ -2364,12 +2364,12 @@ public class WebappClassLoader extends U
Integer.valueOf(countRemoved), getContextName()));
}
} catch (SecurityException e) {
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.clearReferencesResourceBundlesFail",
getContextName()), e);
} catch (NoSuchFieldException e) {
if (Globals.IS_ORACLE_JVM) {
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.clearReferencesResourceBundlesFail",
getContextName()), e);
} else {
@@ -2378,11 +2378,11 @@ public class WebappClassLoader extends U
getContextName()), e);
}
} catch (IllegalArgumentException e) {
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.clearReferencesResourceBundlesFail",
getContextName()), e);
} catch (IllegalAccessException e) {
- log.info(sm.getString(
+ log.warn(sm.getString(
"webappClassLoader.clearReferencesResourceBundlesFail",
getContextName()), e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org