First cut of ICE-6920 - Remove try/catch block around communicator destroy

7 files changed, 9 insertions, 86 deletions

diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java b/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java
index f5c35d5c86f..b39388666a6 100644
--- a/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java
+++ b/java-compat/src/Glacier2/src/main/java/Glacier2/Application.java
@@ -469,20 +469,7 @@ public abstract class Application extends Ice.Application
 
         if(_communicator != null)
         {
-            try
-            {
-                _communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                Ice.Util.getProcessLogger().error(IceInternal.Ex.toString(ex));
-                status.value = 1;
-            }
-            catch(java.lang.Exception ex)
-            {
-                Ice.Util.getProcessLogger().error("unknown exception:\n" + IceInternal.Ex.toString(ex));
-                status.value = 1;
-            }
+            _communicator.destroy();
             _communicator = null;
         }
 
diff --git a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
index 2b02cabfe29..24a63b3b5db 100644
--- a/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
+++ b/java-compat/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
@@ -426,13 +426,7 @@ public class SessionHelper
             communicator.getLogger().warning("SessionHelper: unexpected exception when destroying the session:\n" + e);
         }
 
-        try
-        {
-            communicator.destroy();
-        }
-        catch(Throwable ex)
-        {
-        }
+        communicator.destroy();
 
         //
         // Notify the callback that the session is gone.
@@ -458,13 +452,7 @@ public class SessionHelper
 
         if(communicator != null)
         {
-            try
-            {
-                _communicator.destroy();
-            }
-            catch(Throwable ex)
-            {
-            }
+            communicator.destroy();
         }
     }
 
@@ -552,13 +540,7 @@ public class SessionHelper
                 }
                 catch(final Exception ex)
                 {
-                    try
-                    {
-                        _communicator.destroy();
-                    }
-                    catch(Throwable ex1)
-                    {
-                    }
+                    _communicator.destroy();
 
                     dispatchCallback(new Runnable()
                     {
diff --git a/java-compat/test/src/main/java/test/Ice/hash/Client.java b/java-compat/test/src/main/java/test/Ice/hash/Client.java
index 12d711fc51a..f1407427e40 100644
--- a/java-compat/test/src/main/java/test/Ice/hash/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/hash/Client.java
@@ -423,15 +423,7 @@ public class Client extends test.Util.Application
 
             if(communicator != null)
             {
-                try
-                {
-                    communicator.destroy();
-                }
-                catch(Ice.LocalException ex)
-                {
-                    System.out.println(ex.toString());
-                    status = 1;
-                }
+                communicator.destroy();
             }
         }
         catch(Exception ex)
diff --git a/java-compat/test/src/main/java/test/Ice/throughput/Client.java b/java-compat/test/src/main/java/test/Ice/throughput/Client.java
index ea891ac0a0f..247726675a5 100644
--- a/java-compat/test/src/main/java/test/Ice/throughput/Client.java
+++ b/java-compat/test/src/main/java/test/Ice/throughput/Client.java
@@ -28,14 +28,7 @@ public class Client extends test.Util.Application
         public void
         run()
         {
-            try
-            {
-                communicator().destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-            }
+            communicator().destroy();
         }
     }
 
diff --git a/java-compat/test/src/main/java/test/Slice/escape/Client.java b/java-compat/test/src/main/java/test/Slice/escape/Client.java
index 998291e1583..380d82025ac 100644
--- a/java-compat/test/src/main/java/test/Slice/escape/Client.java
+++ b/java-compat/test/src/main/java/test/Slice/escape/Client.java
@@ -212,15 +212,7 @@ public class Client
 
         if(communicator != null)
         {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
+            communicator.destroy();
         }
 
         System.gc();
diff --git a/java-compat/test/src/main/java/test/Slice/structure/Client.java b/java-compat/test/src/main/java/test/Slice/structure/Client.java
index ede1f92c0c8..a4b09ea9891 100644
--- a/java-compat/test/src/main/java/test/Slice/structure/Client.java
+++ b/java-compat/test/src/main/java/test/Slice/structure/Client.java
@@ -298,15 +298,7 @@ public class Client
 
         if(communicator != null)
         {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
+            communicator.destroy();
         }
 
         System.gc();
diff --git a/java-compat/test/src/main/java/test/Util/Application.java b/java-compat/test/src/main/java/test/Util/Application.java
index 7cc08508e3a..30fcbc3d3af 100644
--- a/java-compat/test/src/main/java/test/Util/Application.java
+++ b/java-compat/test/src/main/java/test/Util/Application.java
@@ -135,22 +135,7 @@ public abstract class Application
 
         if(_communicator != null)
         {
-            try
-            {
-                _communicator.destroy();
-            }
-            catch(LocalException ex)
-            {
-                writer.println(_testName + ": " + ex);
-                ex.printStackTrace(writer);
-                status = 1;
-            }
-            catch(java.lang.Exception ex)
-            {
-                writer.println(_testName + ": unknown exception");
-                ex.printStackTrace(writer);
-                status = 1;
-            }
+            _communicator.destroy();
             _communicator = null;
         }
         writer.flush();