bug 2274 - review exception catching in Java/C# tests

61 files changed, 77 insertions, 75 deletions

diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java
index 68b21d2bc01..81099d6ac79 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/Freeze/evictor/Client.java
@@ -109,11 +109,13 @@ public class Client
                 catch(Ice.LocalException e)
                 {
                     System.err.println("Caught unexpected : " + e.toString());
+                    e.printStackTrace();
                     test(false);
                     return;
                 }
                 catch(Exception e)
                 {
+                    e.printStackTrace();
                     test(false);
                     return;
                 }
@@ -1018,22 +1020,22 @@ public class Client
                 status = run(args, communicator, true, true);
             }
         }
-        catch(Ice.LocalException ex)
+        catch(Test.AlreadyRegisteredException ex)
         {
             ex.printStackTrace();
             status = 1;
         }
-        catch(Test.AlreadyRegisteredException ex)
+        catch(Test.NotRegisteredException ex)
         {
             ex.printStackTrace();
             status = 1;
         }
-        catch(Test.NotRegisteredException ex)
+        catch(Test.EvictorDeactivatedException ex)
         {
             ex.printStackTrace();
             status = 1;
         }
-        catch(Test.EvictorDeactivatedException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java
index dcd4f80fe1e..8de6fc0a799 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/Freeze/evictor/Server.java
@@ -24,7 +24,6 @@ public class Server
         }
     }
 
-
     static class ServantFactory extends Ice.LocalObjectImpl implements Ice.ObjectFactory
     {
         public Ice.Object
@@ -95,7 +94,7 @@ public class Server
             args = holder.value;
             status = run(args, communicator, envName);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Freeze/oldevictor/Client.java b/java/test/Freeze/oldevictor/Client.java
index c6cd90734f6..c52145d07c3 100644
--- a/java/test/Freeze/oldevictor/Client.java
+++ b/java/test/Freeze/oldevictor/Client.java
@@ -109,11 +109,13 @@ public class Client
                 catch(Ice.LocalException e)
                 {
                     System.err.println("Caught unexpected : " + e.toString());
+                    e.printStackTrace();
                     test(false);
                     return;
                 }
                 catch(Exception e)
                 {
+                    e.printStackTrace();
                     test(false);
                     return;
                 }
@@ -877,22 +879,22 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Test.AlreadyRegisteredException ex)
         {
             ex.printStackTrace();
             status = 1;
         }
-        catch(Test.AlreadyRegisteredException ex)
+        catch(Test.NotRegisteredException ex)
         {
             ex.printStackTrace();
             status = 1;
         }
-        catch(Test.NotRegisteredException ex)
+        catch(Test.EvictorDeactivatedException ex)
         {
             ex.printStackTrace();
             status = 1;
         }
-        catch(Test.EvictorDeactivatedException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Freeze/oldevictor/Server.java b/java/test/Freeze/oldevictor/Server.java
index 64523ab67fe..5b01e64ef7a 100644
--- a/java/test/Freeze/oldevictor/Server.java
+++ b/java/test/Freeze/oldevictor/Server.java
@@ -80,7 +80,7 @@ public class Server
             args = holder.value;
             status = run(args, communicator, envName);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Glacier2/attack/AttackClient.java b/java/test/Glacier2/attack/AttackClient.java
index eacaf831ffc..1a93f058ae4 100644
--- a/java/test/Glacier2/attack/AttackClient.java
+++ b/java/test/Glacier2/attack/AttackClient.java
@@ -109,7 +109,8 @@ class AttackClient extends Ice.Application
         System.out.flush();
         backend.shutdown();
         communicator().setDefaultRouter(null);
-        Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
+        Ice.ObjectPrx processBase =
+            communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000");
         Ice.ProcessPrx process = Ice.ProcessPrxHelper.checkedCast(processBase);
         test(process != null);
         process.shutdown();
diff --git a/java/test/Ice/background/Client.java b/java/test/Ice/background/Client.java
index c3090428ff1..ee7c89ca2b1 100644
--- a/java/test/Ice/background/Client.java
+++ b/java/test/Ice/background/Client.java
@@ -49,7 +49,7 @@ public class Client
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator, System.out);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java
index 23f6a3879d0..37cb617d4ac 100644
--- a/java/test/Ice/background/Server.java
+++ b/java/test/Ice/background/Server.java
@@ -142,7 +142,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator, System.out);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/binding/Client.java b/java/test/Ice/binding/Client.java
index d9e79ca3de6..c79f7dc4991 100644
--- a/java/test/Ice/binding/Client.java
+++ b/java/test/Ice/binding/Client.java
@@ -27,7 +27,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch (Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/binding/Server.java b/java/test/Ice/binding/Server.java
index 53521c75351..81729a18e6c 100644
--- a/java/test/Ice/binding/Server.java
+++ b/java/test/Ice/binding/Server.java
@@ -33,7 +33,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/checksum/client/Client.java b/java/test/Ice/checksum/client/Client.java
index 147393f79c6..b3a0bf1d99d 100644
--- a/java/test/Ice/checksum/client/Client.java
+++ b/java/test/Ice/checksum/client/Client.java
@@ -28,7 +28,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/checksum/server/Server.java b/java/test/Ice/checksum/server/Server.java
index b8597b92456..5cc748487fe 100644
--- a/java/test/Ice/checksum/server/Server.java
+++ b/java/test/Ice/checksum/server/Server.java
@@ -32,7 +32,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java
index 95e19e3fcfc..880689040f4 100644
--- a/java/test/Ice/custom/Client.java
+++ b/java/test/Ice/custom/Client.java
@@ -30,7 +30,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java
index ec131823c08..947128d4b95 100644
--- a/java/test/Ice/custom/Collocated.java
+++ b/java/test/Ice/custom/Collocated.java
@@ -33,7 +33,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java
index 29bd204d9f6..22686f0dbc3 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/Ice/custom/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index 2b3c90e3c8c..6ebffe3b8a7 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -35,7 +35,7 @@ public class Client
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index 8b1d8c6a1fe..6fefaa852a6 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -33,7 +33,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index 3eee4f47510..26eba295622 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -42,7 +42,7 @@ public class Server
             communicator = Ice.Util.initialize(args, initData);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java
index 3eee4f47510..26eba295622 100644
--- a/java/test/Ice/exceptionsAMD/Server.java
+++ b/java/test/Ice/exceptionsAMD/Server.java
@@ -42,7 +42,7 @@ public class Server
             communicator = Ice.Util.initialize(args, initData);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index 5c46ecf0f78..b687781fc16 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/Ice/facets/Client.java
@@ -30,7 +30,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index 925f055f511..db1d30d8eec 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/Ice/facets/Collocated.java
@@ -38,7 +38,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index 144fcf9e7ba..19f771f3642 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -39,7 +39,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index a6f64994a4b..5c92ce9ee93 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -87,12 +87,12 @@ public class Client
             //
             // This test aborts servers, so we don't want warnings.
             //
-           initData. properties.setProperty("Ice.Warn.Connections", "0");
+            initData. properties.setProperty("Ice.Warn.Connections", "0");
 
-           communicator = Ice.Util.initialize(argsH, initData);
+            communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index ba93e34b425..3adb4439fe7 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -85,7 +85,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/hold/Client.java b/java/test/Ice/hold/Client.java
index c9d2c0b9e90..9d3ce43b832 100644
--- a/java/test/Ice/hold/Client.java
+++ b/java/test/Ice/hold/Client.java
@@ -27,7 +27,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/hold/Server.java b/java/test/Ice/hold/Server.java
index 993eaa1808e..7b4ccd2084a 100644
--- a/java/test/Ice/hold/Server.java
+++ b/java/test/Ice/hold/Server.java
@@ -31,7 +31,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index a6fa83a226d..b3eb0bb1e5f 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/Ice/inheritance/Client.java
@@ -30,7 +30,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index de32e7c8325..f11dfb03ff5 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/Ice/inheritance/Collocated.java
@@ -33,7 +33,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 34c2bb8ee02..5a4a8629a4b 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -32,7 +32,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index e774fe2bc6e..c4f6a30f3ac 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -60,7 +60,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator, initData);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index 65520dd2377..82d97f51d69 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -89,7 +89,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index 1d976777281..db6beba2f89 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -35,7 +35,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 2b08a8b865f..d2166ed456b 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -68,7 +68,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 82fe5159548..4f8c26c2d55 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -58,7 +58,7 @@ public class Client
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index f3a0e5c397b..b10bff56681 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -36,7 +36,7 @@ public class Collocated
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index dac5536e2e1..e1766d6a2bd 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -42,7 +42,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java
index 0ca11fe04ae..d7cbf2b9833 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -38,7 +38,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/package/Client.java b/java/test/Ice/package/Client.java
index c9a9d5a500c..308cbb94dc5 100644
--- a/java/test/Ice/package/Client.java
+++ b/java/test/Ice/package/Client.java
@@ -28,7 +28,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/package/Server.java b/java/test/Ice/package/Server.java
index afd51233c3d..e7a4f8446cc 100644
--- a/java/test/Ice/package/Server.java
+++ b/java/test/Ice/package/Server.java
@@ -32,7 +32,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/proxy/Client.java b/java/test/Ice/proxy/Client.java
index ba62e55d912..19f41f7f360 100644
--- a/java/test/Ice/proxy/Client.java
+++ b/java/test/Ice/proxy/Client.java
@@ -32,7 +32,7 @@ public class Client
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/Ice/proxy/Collocated.java
index 738cc64968e..dd865143812 100644
--- a/java/test/Ice/proxy/Collocated.java
+++ b/java/test/Ice/proxy/Collocated.java
@@ -36,7 +36,7 @@ public class Collocated
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/proxy/Server.java b/java/test/Ice/proxy/Server.java
index 8a8ff5fd2de..85ef9230478 100644
--- a/java/test/Ice/proxy/Server.java
+++ b/java/test/Ice/proxy/Server.java
@@ -35,7 +35,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/proxyAMD/Server.java b/java/test/Ice/proxyAMD/Server.java
index 706267bfcde..d3615833c45 100644
--- a/java/test/Ice/proxyAMD/Server.java
+++ b/java/test/Ice/proxyAMD/Server.java
@@ -38,7 +38,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/retry/Client.java b/java/test/Ice/retry/Client.java
index 69e2eca712c..53d4a927ef6 100644
--- a/java/test/Ice/retry/Client.java
+++ b/java/test/Ice/retry/Client.java
@@ -40,10 +40,9 @@ public class Client
             initData.properties.setProperty("Ice.Warn.Connections", "0");
 
             communicator = Ice.Util.initialize(argsH, initData);
-            
             status = run(argsH.value, communicator, System.out);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/retry/Server.java b/java/test/Ice/retry/Server.java
index b865beaad05..01492bef5b1 100644
--- a/java/test/Ice/retry/Server.java
+++ b/java/test/Ice/retry/Server.java
@@ -41,7 +41,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator, System.out);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/slicing/exceptions/csrc/Client.java b/java/test/Ice/slicing/exceptions/csrc/Client.java
index 0ce3487c371..cd40d91f958 100644
--- a/java/test/Ice/slicing/exceptions/csrc/Client.java
+++ b/java/test/Ice/slicing/exceptions/csrc/Client.java
@@ -30,7 +30,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/slicing/exceptions/ssrc/Server.java b/java/test/Ice/slicing/exceptions/ssrc/Server.java
index 59c58121014..e75b5a97fa1 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/Server.java
+++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/slicing/exceptionsAMD/Server.java b/java/test/Ice/slicing/exceptionsAMD/Server.java
index 5745753d51c..93fcfcbf9c4 100644
--- a/java/test/Ice/slicing/exceptionsAMD/Server.java
+++ b/java/test/Ice/slicing/exceptionsAMD/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/slicing/objects/csrc/Client.java b/java/test/Ice/slicing/objects/csrc/Client.java
index 0ce3487c371..cd40d91f958 100644
--- a/java/test/Ice/slicing/objects/csrc/Client.java
+++ b/java/test/Ice/slicing/objects/csrc/Client.java
@@ -30,7 +30,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/slicing/objects/ssrc/Server.java b/java/test/Ice/slicing/objects/ssrc/Server.java
index 59c58121014..e75b5a97fa1 100644
--- a/java/test/Ice/slicing/objects/ssrc/Server.java
+++ b/java/test/Ice/slicing/objects/ssrc/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java
index 5745753d51c..93fcfcbf9c4 100644
--- a/java/test/Ice/slicing/objectsAMD/Server.java
+++ b/java/test/Ice/slicing/objectsAMD/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index 62b3374246c..375be462cdc 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -520,7 +520,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/threads/Client.java b/java/test/Ice/threads/Client.java
index 79cda23b10b..d2dda06ef78 100644
--- a/java/test/Ice/threads/Client.java
+++ b/java/test/Ice/threads/Client.java
@@ -28,7 +28,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/threads/Server.java b/java/test/Ice/threads/Server.java
index 2a4090691bf..b4671303d88 100644
--- a/java/test/Ice/threads/Server.java
+++ b/java/test/Ice/threads/Server.java
@@ -33,7 +33,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/timeout/Client.java b/java/test/Ice/timeout/Client.java
index 8b7d27c33eb..231e5ec929d 100644
--- a/java/test/Ice/timeout/Client.java
+++ b/java/test/Ice/timeout/Client.java
@@ -42,7 +42,7 @@ public class Client
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator, System.out);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java
index 0923996d71d..b73538ff5cd 100644
--- a/java/test/Ice/timeout/Server.java
+++ b/java/test/Ice/timeout/Server.java
@@ -50,7 +50,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator, System.out);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/IceBox/configuration/Client.java b/java/test/IceBox/configuration/Client.java
index ba55ab18d7c..428da598c10 100644
--- a/java/test/IceBox/configuration/Client.java
+++ b/java/test/IceBox/configuration/Client.java
@@ -35,13 +35,13 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch (Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
         }
 
-        if (communicator != null)
+        if(communicator != null)
         {
             try
             {
diff --git a/java/test/IceGrid/simple/AllTests.java b/java/test/IceGrid/simple/AllTests.java
index 76a07c74b63..a6dda92300b 100644
--- a/java/test/IceGrid/simple/AllTests.java
+++ b/java/test/IceGrid/simple/AllTests.java
@@ -58,10 +58,11 @@ public class AllTests
         final private long _timeout;
         private boolean _terminated;
     }
+
     private static void
     test(boolean b)
     {
-        if (!b)
+        if(!b)
         {
             throw new RuntimeException();
         }
diff --git a/java/test/IceGrid/simple/Client.java b/java/test/IceGrid/simple/Client.java
index 6c277e67c0f..867f1555d3c 100644
--- a/java/test/IceGrid/simple/Client.java
+++ b/java/test/IceGrid/simple/Client.java
@@ -24,8 +24,6 @@ public class Client
             }
         }
 
-        ;
-
         if(!withDeploy)
         {
             AllTests.allTests(communicator);
@@ -49,13 +47,13 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch (Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
         }
 
-        if (communicator != null)
+        if(communicator != null)
         {
             try
             {
diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java
index e18898f8d17..d24d99dc759 100644
--- a/java/test/IceSSL/configuration/Client.java
+++ b/java/test/IceSSL/configuration/Client.java
@@ -38,7 +38,7 @@ public class Client
             communicator = Ice.Util.initialize(argsH);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/IceSSL/configuration/Server.java b/java/test/IceSSL/configuration/Server.java
index 0ad48a2db14..02fe64c5110 100644
--- a/java/test/IceSSL/configuration/Server.java
+++ b/java/test/IceSSL/configuration/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;
diff --git a/java/test/Slice/keyword/Client.java b/java/test/Slice/keyword/Client.java
index f04d7243454..f3c8368205b 100644
--- a/java/test/Slice/keyword/Client.java
+++ b/java/test/Slice/keyword/Client.java
@@ -173,7 +173,7 @@ public class Client
             communicator = Ice.Util.initialize(argsH, initData);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
             status = 1;