From a3fcb5f5895063aaa41723566104542c92d8afc9 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 28 Sep 2010 20:43:32 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49195 Avoid error message when shutting down Windows service when the shutdown port is disabled. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1002349 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/Catalina.java | 4 ++++ webapps/docs/changelog.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java index 058fbc35b..2e2dd3f5c 100644 --- a/java/org/apache/catalina/startup/Catalina.java +++ b/java/org/apache/catalina/startup/Catalina.java @@ -432,6 +432,10 @@ public class Catalina { log.error("Catalina.stop: ", e); System.exit(1); } + } else { + // Server object already present. Must be running as a service + // Shutdown hook will take care of clean-up + System.exit(0); } // Stop the existing server diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 313377212..9b31a7425 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -53,6 +53,10 @@ provided by Jiong Wang. (markt) + 49195: Don't report an error when shutting down a Windows + service for a Tomcat instance that has a disabled shutdown port. (markt) + + 49209: Prevent possible AccessControlException during undeployment when running with a security manager. Patch provided by Sylvain Laurent. -- 2.11.0