http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1391.

7 files changed, 212 insertions, 37 deletions

diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index 35a91f8b6ac..f382f6cbf66 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -11,6 +11,22 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    class ShutdownHook extends Thread
+    {
+	public void
+	run()
+	{
+	    try
+	    {
+		communicator().destroy();
+	    }
+	    catch(Ice.LocalException ex)
+	    {
+		ex.printStackTrace();
+	    }
+	}
+    }
+
     private static void
     menu()
     {
@@ -31,6 +47,13 @@ public class Client extends Ice.Application
     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());
+
         CallbackSenderPrx twoway = CallbackSenderPrxHelper.checkedCast(
 	    communicator().propertyToProxy("Callback.Client.CallbackServer").
 	        ice_twoway().ice_timeout(-1).ice_secure(false));
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index df647df390e..67fd95e2d3e 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -11,6 +11,22 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    class ShutdownHook extends Thread
+    {
+	public void
+	run()
+	{
+	    try
+	    {
+		communicator().destroy();
+	    }
+	    catch(Ice.LocalException ex)
+	    {
+		ex.printStackTrace();
+	    }
+	}
+    }
+
     private static void
     menu()
     {
@@ -33,6 +49,13 @@ public class Client extends Ice.Application
     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());
+
         HelloPrx twoway = HelloPrxHelper.checkedCast(
 	    communicator().propertyToProxy("Hello.Proxy").ice_twoway().ice_timeout(-1).ice_secure(false));
         if(twoway == null)
@@ -206,3 +229,4 @@ public class Client extends Ice.Application
         System.exit(status);
     }
 }
+
diff --git a/java/demo/Ice/invoke/Client.java b/java/demo/Ice/invoke/Client.java
index 0ba48171d1c..1275ecaad12 100644
--- a/java/demo/Ice/invoke/Client.java
+++ b/java/demo/Ice/invoke/Client.java
@@ -30,9 +30,32 @@ public class Client extends Ice.Application
             "?: help\n");
     }
 
+    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());
+
         Ice.ObjectPrx obj = communicator().propertyToProxy("Printer.Proxy");
 
         menu();
diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java
index b16a183b257..60264585c7e 100644
--- a/java/demo/Ice/nested/Client.java
+++ b/java/demo/Ice/nested/Client.java
@@ -11,10 +11,40 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    class ShutdownHook extends Thread
+    {
+	public void
+	run()
+	{
+	    /*
+	     * For this demo we won't destroy the communicator since it has to
+	     * wait for any outstanding invocations to complete which may take
+	     * some time if the nesting level is exceeded.
+	     *
+	     try
+	     {
+	         communicator().destroy();
+	     }
+	     catch(Ice.LocalException ex)
+	     {
+	         ex.printStackTrace();
+	     }
+	    */
+	}
+    }
+
     public int
     run(String[] args)
     {
-        NestedPrx nested = NestedPrxHelper.checkedCast(communicator().propertyToProxy("Nested.Client.NestedServer"));
+	//
+	// Since this is an interactive demo we want to clear the
+	// Application installed interrupt callback and install our
+	// own shutdown hook.
+	//
+	setInterruptHook(new ShutdownHook());
+
+        NestedPrx nested = NestedPrxHelper.checkedCast(
+	    communicator().propertyToProxy("Nested.Client.NestedServer"));
         if(nested == null)
         {
             System.err.println("invalid proxy");
diff --git a/java/demo/Ice/session/Client.java b/java/demo/Ice/session/Client.java
index 5b5a0be67a1..0009a2fefec 100644
--- a/java/demo/Ice/session/Client.java
+++ b/java/demo/Ice/session/Client.java
@@ -11,6 +11,24 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    class ShutdownHook extends Thread
+    {
+	public void
+	run()
+	{
+	    System.out.println("Hi");
+	    cleanup(true);
+	    try
+	    {
+		communicator().destroy();
+	    }
+	    catch(Ice.LocalException ex)
+	    {
+		ex.printStackTrace();
+	    }
+	}
+    }
+
     static private class SessionRefreshThread extends Thread
     {
 	SessionRefreshThread(Ice.Logger logger, long timeout, SessionPrx session)
@@ -76,6 +94,13 @@ public class Client extends Ice.Application
     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());
+
         java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
 	String name;
 	try
@@ -102,15 +127,17 @@ public class Client extends Ice.Application
             return 1;
         }
 
-    	SessionPrx session = factory.create(name);
-    	SessionRefreshThread refresh = new SessionRefreshThread(communicator().getLogger(), 5000, session);
-    	refresh.start();
-
+	synchronized(this)
+	{
+	    _session = factory.create(name);
+	    _refresh = new SessionRefreshThread(communicator().getLogger(), 5000, _session);
+	    _refresh.start();
+	}
+	    
     	java.util.ArrayList hellos = new java.util.ArrayList();
 
         menu();
 
-
 	try
 	{
 	    boolean destroy = true;
@@ -149,7 +176,7 @@ public class Client extends Ice.Application
 		}
                 else if(line.equals("c"))
                 {
-                    hellos.add(session.createHello());
+                    hellos.add(_session.createHello());
     	    	    System.out.println("created hello object " + (hellos.size()-1));
                 }
                 else if(line.equals("s"))
@@ -177,26 +204,8 @@ public class Client extends Ice.Application
                     menu();
                 }
             }
-	    //
-	    // The refresher thread must be terminated before destroy is
-	    // called, otherwise it might get ObjectNotExistException. refresh
-	    // is set to 0 so that if session->destroy() raises an exception
-	    // the thread will not be re-terminated and re-joined.
-	    //
-	    refresh.terminate();
-	    try
-	    {
-		refresh.join();
-	    }
-	    catch(InterruptedException e)
-	    {
-	    }
-	    refresh = null;
 
-    	    if(destroy)
-	    {
-		session.destroy();
-	    }
+	    cleanup(destroy);
     	    if(shutdown)
 	    {
 		factory.shutdown();
@@ -212,22 +221,39 @@ public class Client extends Ice.Application
 	}
 	finally
 	{
-	    if(refresh != null)
-	    {
-		refresh.terminate();
-		try
-		{
-		    refresh.join();
-		}
-		catch(InterruptedException e)
-		{
-		}
-	    }
+	    cleanup(true);
 	}
 
         return 0;
     }
 
+    synchronized private void
+    cleanup(boolean destroy)
+    {
+	//
+	// The refresher thread must be terminated before destroy is
+	// called, otherwise it might get ObjectNotExistException.
+	//
+	if(_refresh != null)
+	{
+	    _refresh.terminate();
+	    try
+	    {
+		_refresh.join();
+	    }
+	    catch(InterruptedException e)
+	    {
+	    }
+	    _refresh = null;
+	}
+	
+	if(destroy && _session != null)
+	{
+	    _session.destroy();
+	    _session = null;
+	}
+    }
+
     public static void
     main(String[] args)
     {
@@ -235,4 +261,7 @@ public class Client extends Ice.Application
         int status = app.main("Client", args, "config.client");
         System.exit(status);
     }
+
+    private SessionRefreshThread _refresh = null;
+    private SessionPrx _session = null;
 }
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index 99bfdcef97a..1d926a71b0a 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -11,6 +11,22 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    class ShutdownHook extends Thread
+    {
+	public void
+	run()
+	{
+	    try
+	    {
+		communicator().destroy();
+	    }
+	    catch(Ice.LocalException ex)
+	    {
+		ex.printStackTrace();
+	    }
+	}
+    }
+
     private static void
     menu()
     {
@@ -38,6 +54,13 @@ public class Client extends Ice.Application
     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());
+
         Ice.ObjectPrx base = communicator().propertyToProxy("Throughput.Throughput");
         ThroughputPrx throughput = ThroughputPrxHelper.checkedCast(base);
         if(throughput == null)
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index 3ef39e8a35b..f33166da5fd 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -11,6 +11,22 @@ import Demo.*;
 
 public class Client extends Ice.Application
 {
+    class ShutdownHook extends Thread
+    {
+	public void
+	run()
+	{
+	    try
+	    {
+		communicator().destroy();
+	    }
+	    catch(Ice.LocalException ex)
+	    {
+		ex.printStackTrace();
+	    }
+	}
+    }
+
     private static void
     readline(java.io.BufferedReader in)
     {
@@ -27,6 +43,13 @@ public class Client extends Ice.Application
     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());
+
         Ice.ObjectPrx base = communicator().propertyToProxy("Value.Initial");
         InitialPrx initial = InitialPrxHelper.checkedCast(base);
         if(initial == null)