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, 17 insertions, 0 deletions

diff --git a/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java
index 27cddadb8..fbcf65ac0 100644
--- a/base/common/src/com/netscape/certsrv/apps/CMS.java
+++ b/base/common/src/com/netscape/certsrv/apps/CMS.java
@@ -1661,5 +1661,22 @@ public final class CMS {
             start(path);
         } catch (EBaseException e) {
         }
+
+        // Use shutdown hook in stand-alone application
+        // to catch SIGINT, SIGTERM, or SIGHUP.
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            public void run() {
+                /*LogDoc
+                *
+                * @phase watchdog check
+                */
+                CMS.getLogger().log(ILogger.EV_SYSTEM,
+                        ILogger.S_OTHER,
+                        ILogger.LL_INFO,
+                        "CMSEngine: Received shutdown signal");
+
+                CMS.shutdown();
+            };
+        });
     }
 }