Fixed incorrect calls to Communicator.destroy().

13 files changed, 159 insertions, 58 deletions

diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java
index 76cc09e92ac..40ced49e7a3 100644
--- a/java/demo/Glacier/session/Client.java
+++ b/java/demo/Glacier/session/Client.java
@@ -220,12 +220,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
-	    }
-	}
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Glacier/session/Server.java b/java/demo/Glacier/session/Server.java
index 5dad17cbb5b..4626cf56389 100644
--- a/java/demo/Glacier/session/Server.java
+++ b/java/demo/Glacier/session/Server.java
@@ -64,13 +64,20 @@ public class Server
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
             }
-	}
-
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
         System.exit(status);
     }
 }
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index c48c8982d34..6e77b1a3d38 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -165,12 +165,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
-	    }
-	}
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java
index e8a3e3afa4c..c3a0d9b0e3c 100644
--- a/java/demo/Ice/hello/Server.java
+++ b/java/demo/Ice/hello/Server.java
@@ -37,12 +37,20 @@ public class Server
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
-		communicator.destroy();
-	    }
-	}
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
+                communicator.destroy();
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index cfdbfb0ae80..3b801bc4141 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -67,12 +67,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
-	    }
-	}
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java
index 3e06aeeed46..29c86d3703e 100644
--- a/java/demo/Ice/latency/Server.java
+++ b/java/demo/Ice/latency/Server.java
@@ -37,12 +37,20 @@ public class Server
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
-	    }
-	}
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index 38a885837ba..b41aa1fb079 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -188,12 +188,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
             }
-	}
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/throughput/Server.java b/java/demo/Ice/throughput/Server.java
index 59ca4efe30d..fcb8c941984 100644
--- a/java/demo/Ice/throughput/Server.java
+++ b/java/demo/Ice/throughput/Server.java
@@ -37,12 +37,20 @@ public class Server
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
             }
-	}
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index eed414bb581..79369dd4e73 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -198,12 +198,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
             }
-	}
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java
index d7d9f31a815..5bd42ec9e5c 100644
--- a/java/demo/Ice/value/Server.java
+++ b/java/demo/Ice/value/Server.java
@@ -37,12 +37,20 @@ public class Server
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
             }
-	}
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index f4d2063e0cb..3d58e887c16 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -160,12 +160,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
             }
-	}
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }
diff --git a/java/demo/IcePack/hello/Client.java b/java/demo/IcePack/hello/Client.java
index 5e84c39e2dc..fb2d0551a87 100644
--- a/java/demo/IcePack/hello/Client.java
+++ b/java/demo/IcePack/hello/Client.java
@@ -180,12 +180,18 @@ public class Client
             ex.printStackTrace();
             status = 1;
         }
-        finally
+
+        if(communicator != null)
         {
-            if(communicator != null)
+            try
             {
                 communicator.destroy();
             }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
         }
 
         System.exit(status);
diff --git a/java/demo/IcePack/simple/Client.java b/java/demo/IcePack/simple/Client.java
index b75833eecfb..62480255e54 100644
--- a/java/demo/IcePack/simple/Client.java
+++ b/java/demo/IcePack/simple/Client.java
@@ -167,12 +167,20 @@ public class Client
         {
             ex.printStackTrace();
             status = 1;
-        } finally {
-	    if(communicator != null)
-	    {
+        }
+
+        if(communicator != null)
+        {
+            try
+            {
                 communicator.destroy();
-	    }
-	}
+            }
+            catch(Ice.LocalException ex)
+            {
+                ex.printStackTrace();
+                status = 1;
+            }
+        }
 
         System.exit(status);
     }