Fixed errors during Tomcat shutdown.

Previously the CMS.shutdown() was called multiple times during Tomcat
shutdown, one by CMSStarServlet.destroy() and the other by the shutdown
hook, causing some errors. The shutdown hook should only be used in a
standalone application, so it has been moved into CMS.main().

Bugzilla #1018628

1 files changed, 3 insertions, 0 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java
index 8e3a4b5ba..60230dbab 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSStartServlet.java
@@ -120,6 +120,9 @@ public class CMSStartServlet extends HttpServlet {
         return "CMS startup servlet";
     }
 
+    /**
+     * This method will be called when Tomcat is shutdown.
+     */
     public void destroy() {
         CMS.shutdown();
         super.destroy();