You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/20 21:58:14 UTC
svn commit: r1187028 -
/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Author: markt
Date: Thu Oct 20 19:58:13 2011
New Revision: 1187028
URL: http://svn.apache.org/viewvc?rev=1187028&view=rev
Log:
Remove Java 1.2 error handling
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1187028&r1=1187027&r2=1187028&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Oct 20 19:58:13 2011
@@ -631,34 +631,27 @@ public class Catalina {
log.info("Server startup in " + ((t2 - t1) / 1000000) + " ms");
}
- try {
- // Register shutdown hook
- if (useShutdownHook) {
- if (shutdownHook == null) {
- shutdownHook = new CatalinaShutdownHook();
- }
- Runtime.getRuntime().addShutdownHook(shutdownHook);
+ // Register shutdown hook
+ if (useShutdownHook) {
+ if (shutdownHook == null) {
+ shutdownHook = new CatalinaShutdownHook();
+ }
+ Runtime.getRuntime().addShutdownHook(shutdownHook);
- // If JULI is being used, disable JULI's shutdown hook since
- // shutdown hooks run in parallel and log messages may be lost
- // if JULI's hook completes before the CatalinaShutdownHook()
- LogManager logManager = LogManager.getLogManager();
- if (logManager instanceof ClassLoaderLogManager) {
- ((ClassLoaderLogManager) logManager).setUseShutdownHook(
- false);
- }
+ // If JULI is being used, disable JULI's shutdown hook since
+ // shutdown hooks run in parallel and log messages may be lost
+ // if JULI's hook completes before the CatalinaShutdownHook()
+ LogManager logManager = LogManager.getLogManager();
+ if (logManager instanceof ClassLoaderLogManager) {
+ ((ClassLoaderLogManager) logManager).setUseShutdownHook(
+ false);
}
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- // This will fail on JDK 1.2. Ignoring, as Tomcat can run
- // fine without the shutdown hook.
}
if (await) {
await();
stop();
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org