1 files changed, 23 insertions, 0 deletions
diff --git a/java/demo/Freeze/library/Client.java b/java/demo/Freeze/library/Client.java
index 3105354d443..67b6af17477 100644
--- a/java/demo/Freeze/library/Client.java
+++ b/java/demo/Freeze/library/Client.java
@@ -9,9 +9,32 @@
 
 public class Client extends Ice.Application
 {
+    class ShutdownHook extends Thread
+    {
+	public void
+	run()
+	{
+	    try
+	    {
+		communicator().destroy();
+	    }
+	    catch(Ice.LocalException ex)
+	    {
+		ex.printStackTrace();
+	    }
+	}
+    }
+
     public int
     run(String[] args)
     {
+	//
+	// Since this is an interactive demo we want to clear the
+	// Application installed interrupt callback and install our
+	// own shutdown hook.
+    //
+	setInterruptHook(new ShutdownHook());
+	
 	return RunParser.runParser(appName(), args, communicator());
     }