Runtime->Local

6 files changed, 11 insertions, 11 deletions

diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index 1860ccca610..177d1fc3a16 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -424,13 +424,13 @@ public class AllTests
 
         try
         {
-            thrower.throwRuntimeException();
+            thrower.throwLocalException();
             test(false);
         }
         catch(Ice.TimeoutException ex)
         {
 	}
-        catch(Ice.UnknownRuntimeException ex)
+        catch(Ice.UnknownLocalException 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 f9f45721cae..baa05a6bf0d 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -41,7 +41,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index abde7f70098..40974d85987 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Collocated
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index f928c25a084..14e92c82ed3 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -47,7 +47,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice
index de4423e90ea..ffc5fc673ff 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 throwRuntimeException();
+    void throwLocalException();
     void throwNonIceException();
 };
 
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index e30753ba812..1abf04d7727 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
-    throwRuntimeException(Ice.Current current)
+    throwLocalException(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 java.lang.RuntimeException();
+        throw new RuntimeException();
     }
 
     public void