Renamed Ice::LocalException to Ice::RuntimeException.

34 files changed, 63 insertions, 63 deletions

diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java
index ee721c04f4f..97d032f292a 100644
--- a/java/test/Freeze/complex/Client.java
+++ b/java/test/Freeze/complex/Client.java
@@ -223,7 +223,7 @@ public class Client
 		System.err.println(progName + ": " + ex + ": " + ex.message);
 		status = 1;
 	    }
-	    catch(Ice.LocalException ex)
+	    catch(Ice.RuntimeException ex)
 	    {
 		System.err.println(progName + ": " + ex);
 		status = 1;
diff --git a/java/test/Freeze/cursor/Client.java b/java/test/Freeze/cursor/Client.java
index f9f1066dcf0..c4240d24068 100644
--- a/java/test/Freeze/cursor/Client.java
+++ b/java/test/Freeze/cursor/Client.java
@@ -343,7 +343,7 @@ public class Client
 		System.err.println(args[0] + ": " + ex + ": " + ex.message);
 		status = 1;
 	    }
-	    catch(Ice.LocalException ex)
+	    catch(Ice.RuntimeException ex)
 	    {
 		System.err.println(args[0] + ": " + ex);
 		status = 1;
diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/Freeze/dbmap/Client.java
index 07e8485c077..de3f92ec40e 100644
--- a/java/test/Freeze/dbmap/Client.java
+++ b/java/test/Freeze/dbmap/Client.java
@@ -241,7 +241,7 @@ public class Client
                 System.err.println(args[0] + ": " + ex + ": " + ex.message);
                 status = 1;
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 System.err.println(args[0] + ": " + ex);
                 status = 1;
@@ -265,7 +265,7 @@ public class Client
                 System.err.println(args[0] + ": " + ex + ": " + ex.message);
                 status = 1;
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 System.err.println(args[0] + ": " + ex);
                 status = 1;
@@ -289,7 +289,7 @@ public class Client
 		System.err.println(args[0] + ": " + ex + ": " + ex.message);
 		status = 1;
 	    }
-	    catch(Ice.LocalException ex)
+	    catch(Ice.RuntimeException ex)
 	    {
 		System.err.println(args[0] + ": " + ex);
 		status = 1;
diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java
index e1f6027cb50..66efc345be0 100644
--- a/java/test/Glacier/starter/CallbackClient.java
+++ b/java/test/Glacier/starter/CallbackClient.java
@@ -152,7 +152,7 @@ class CallbackClient extends Ice.Application
         }
         // If we use the glacier router, the exact exception reason gets
         // lost.
-        catch(Ice.UnknownLocalException ex)
+        catch(Ice.UnknownRuntimeException ex)
         {
             System.out.println("ok");
         }
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index 177d1fc3a16..1860ccca610 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -424,13 +424,13 @@ public class AllTests
 
         try
         {
-            thrower.throwLocalException();
+            thrower.throwRuntimeException();
             test(false);
         }
         catch(Ice.TimeoutException ex)
         {
 	}
-        catch(Ice.UnknownLocalException ex)
+        catch(Ice.UnknownRuntimeException ex)
         {
 	    // We get the an unknown local exception without collocation
 	    // optimization. 
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index baa05a6bf0d..f9f45721cae 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -29,7 +29,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -41,7 +41,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index 40974d85987..abde7f70098 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Collocated
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index 14e92c82ed3..f928c25a084 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -35,7 +35,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -47,7 +47,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice
index ffc5fc673ff..de4423e90ea 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/Ice/exceptions/Test.ice
@@ -47,7 +47,7 @@ interface Thrower
     void throwUndeclaredA(int a) throws B, D;
     void throwUndeclaredB(int a, int b);
     void throwUndeclaredC(int a, int b, int c) throws D;
-    void throwLocalException();
+    void throwRuntimeException();
     void throwNonIceException();
 };
 
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index 1abf04d7727..e30753ba812 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/Ice/exceptions/ThrowerI.java
@@ -101,7 +101,7 @@ public final class ThrowerI extends _ThrowerDisp
     }
 
     public void
-    throwLocalException(Ice.Current current)
+    throwRuntimeException(Ice.Current current)
     {
         throw new Ice.TimeoutException();
     }
@@ -109,7 +109,7 @@ public final class ThrowerI extends _ThrowerDisp
     public void
     throwNonIceException(Ice.Current current)
     {
-        throw new RuntimeException();
+        throw new java.lang.RuntimeException();
     }
 
     public void
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index e700d7004d0..d1127b22c3c 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/Ice/facets/Client.java
@@ -29,7 +29,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -41,7 +41,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index 352fedc80d7..579a1b08693 100644
--- a/java/test/Ice/facets/Collocated.java
+++ b/java/test/Ice/facets/Collocated.java
@@ -40,7 +40,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -52,7 +52,7 @@ public class Collocated
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index e7fe97165b3..4916b023cea 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -41,7 +41,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -53,7 +53,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index ea57971e94d..9e27b2c327b 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -74,7 +74,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -86,7 +86,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index 6198d5edce9..f893b890542 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -76,7 +76,7 @@ public class Server
             communicator = Ice.Util.initialize(argsH);
             status = run(argsH.value, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -88,7 +88,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index 54fd01a860b..7e51cb3e1f9 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/Ice/inheritance/Client.java
@@ -29,7 +29,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -41,7 +41,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index b23c19017d9..4c9f51f4186 100644
--- a/java/test/Ice/inheritance/Collocated.java
+++ b/java/test/Ice/inheritance/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Collocated
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 524385b4c00..6ca4ff42c2a 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -33,7 +33,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -45,7 +45,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 16a5507567e..33d3dd640f2 100644
--- a/java/test/Ice/location/AllTests.java
+++ b/java/test/Ice/location/AllTests.java
@@ -72,7 +72,7 @@ public class AllTests
 	{
 	    obj2.ice_ping();
 	}
-	catch(Ice.LocalException ex)
+	catch(Ice.RuntimeException ex)
 	{
 	    test(false);
 	}
diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index b5aba44d35b..d592ba87814 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/Ice/location/Client.java
@@ -30,7 +30,7 @@ public class Client
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch (Ice.LocalException ex)
+        catch (Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -42,7 +42,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch (Ice.LocalException ex)
+            catch (Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index ba4dc54ef95..f7a7ef32d4e 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -55,7 +55,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -67,7 +67,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/locationForward/Client.java b/java/test/Ice/locationForward/Client.java
index 0a0f6482e7d..bb98618dc79 100644
--- a/java/test/Ice/locationForward/Client.java
+++ b/java/test/Ice/locationForward/Client.java
@@ -89,7 +89,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -101,7 +101,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/locationForward/Server.java b/java/test/Ice/locationForward/Server.java
index baa44b0b824..fdf962fa742 100644
--- a/java/test/Ice/locationForward/Server.java
+++ b/java/test/Ice/locationForward/Server.java
@@ -93,7 +93,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -105,7 +105,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index 3f715c262a3..6ccb4bb13ad 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -34,7 +34,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index 3b14d86c061..bb99a16eecf 100644
--- a/java/test/Ice/objects/Collocated.java
+++ b/java/test/Ice/objects/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Collocated
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 524385b4c00..6ca4ff42c2a 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -33,7 +33,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -45,7 +45,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index bb4068c4c09..413569e88e8 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -46,7 +46,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -58,7 +58,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index fb99b620d2a..5004ba15206 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -34,7 +34,7 @@ public class Collocated
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Collocated
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index 768313556d6..61e3ecb9395 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -33,7 +33,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -45,7 +45,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IcePack/deployer/AllTests.java b/java/test/IcePack/deployer/AllTests.java
index a9f1b4db7ab..24ce8ce75ed 100644
--- a/java/test/IcePack/deployer/AllTests.java
+++ b/java/test/IcePack/deployer/AllTests.java
@@ -171,7 +171,7 @@ public class AllTests
 	    obj = TestPrxHelper.checkedCast(communicator.stringToProxy("Server1@Server-Server1"));
 	    test(false);
 	}
-	catch(Ice.LocalException ex)
+	catch(Ice.RuntimeException ex)
 	{
 	}
 
diff --git a/java/test/IcePack/deployer/Client.java b/java/test/IcePack/deployer/Client.java
index df735d6728c..620ab63f33f 100644
--- a/java/test/IcePack/deployer/Client.java
+++ b/java/test/IcePack/deployer/Client.java
@@ -46,7 +46,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch (Ice.LocalException ex)
+        catch (Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -58,7 +58,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch (Ice.LocalException ex)
+            catch (Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java
index d26065b1f80..a9dcd47b942 100644
--- a/java/test/IcePack/simple/Client.java
+++ b/java/test/IcePack/simple/Client.java
@@ -34,7 +34,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch (Ice.LocalException ex)
+        catch (Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch (Ice.LocalException ex)
+            catch (Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IcePack/simple/Server.java b/java/test/IcePack/simple/Server.java
index 11e1d3ff2f1..673b64df328 100644
--- a/java/test/IcePack/simple/Server.java
+++ b/java/test/IcePack/simple/Server.java
@@ -36,7 +36,7 @@ public class Server
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch (Ice.LocalException ex)
+        catch (Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -48,7 +48,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch (Ice.LocalException ex)
+            catch (Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IceXML/encoding/Client.java b/java/test/IceXML/encoding/Client.java
index 95356fc0cd0..1203c6c728b 100644
--- a/java/test/IceXML/encoding/Client.java
+++ b/java/test/IceXML/encoding/Client.java
@@ -612,7 +612,7 @@ public class Client
             communicator = Ice.Util.initialize(args);
             status = run(args, communicator);
         }
-        catch(Ice.LocalException ex)
+        catch(Ice.RuntimeException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -624,7 +624,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.LocalException ex)
+            catch(Ice.RuntimeException ex)
             {
                 ex.printStackTrace();
                 status = 1;