shutdownOnInterrupt is now the default

1 files changed, 6 insertions, 2 deletions

diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 4d3186e8827..792344b6066 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -41,8 +41,7 @@ public abstract class Application
     {
         if(_communicator != null)
         {
-            System.err.println(appName + ": only one instance of the " +
-                               "Application class can be used");
+            System.err.println(appName + ": only one instance of the Application class can be used");
             return 1;
         }
 
@@ -63,6 +62,11 @@ public abstract class Application
             {
                 _communicator = Util.initialize(argHolder);
             }
+
+            // The default is to shutdown when a signal is received
+            //
+            shutdownOnInterrupt();
+
             status = run(argHolder.value);
         }
         catch(LocalException ex)