diff options
| -rw-r--r-- | java/demo/Freeze/library/Server.java | 2 | ||||
| -rw-r--r-- | java/demo/Freeze/phonebook/Server.java | 2 | ||||
| -rw-r--r-- | java/src/Ice/Application.java | 9 | ||||
| -rw-r--r-- | java/src/IceBox/ServiceManagerI.java | 2 | ||||
| -rw-r--r-- | java/test/IcePack/deployer/Server.java | 2 | ||||
| -rw-r--r-- | java/test/IcePack/simple/Server.java | 2 |
6 files changed, 5 insertions, 14 deletions
diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java index 76586883657..6d0e5b8bc09 100644 --- a/java/demo/Freeze/library/Server.java +++ b/java/demo/Freeze/library/Server.java @@ -66,7 +66,7 @@ class LibraryServer extends Freeze.Application shutdownOnInterrupt(); communicator().waitForShutdown(); - ignoreInterrupt(); + defaultInterrupt(); return 0; } diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java index 4b311a222b4..4c2e194418a 100644 --- a/java/demo/Freeze/phonebook/Server.java +++ b/java/demo/Freeze/phonebook/Server.java @@ -68,7 +68,7 @@ class PhoneBookServer extends Freeze.Application shutdownOnInterrupt(); communicator().waitForShutdown(); - ignoreInterrupt(); + defaultInterrupt(); return 0; } diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java index 7621f972f5a..f507094e961 100644 --- a/java/src/Ice/Application.java +++ b/java/src/Ice/Application.java @@ -162,15 +162,6 @@ public abstract class Application } synchronized public static void - ignoreInterrupt() - { - // - // We cannot ignore, only set back to default. - // - defaultInterrupt(); - } - - synchronized public static void defaultInterrupt() { if(_shutdownHook != null) diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 338078c5310..6c0046f696b 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -124,7 +124,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp } _server.communicator().waitForShutdown(); - _server.ignoreInterrupt(); + _server.defaultInterrupt(); // // Invoke stop() on the services. diff --git a/java/test/IcePack/deployer/Server.java b/java/test/IcePack/deployer/Server.java index 682661e1041..c2566f227a5 100644 --- a/java/test/IcePack/deployer/Server.java +++ b/java/test/IcePack/deployer/Server.java @@ -32,7 +32,7 @@ public class Server extends Ice.Application { } communicator().waitForShutdown(); - ignoreInterrupt(); + defaultInterrupt(); return 0; } diff --git a/java/test/IcePack/simple/Server.java b/java/test/IcePack/simple/Server.java index 1fbc64d99ce..7200f40043d 100644 --- a/java/test/IcePack/simple/Server.java +++ b/java/test/IcePack/simple/Server.java @@ -32,7 +32,7 @@ public class Server extends Ice.Application { } communicator().waitForShutdown(); - ignoreInterrupt(); + defaultInterrupt(); return 0; } |