Runtime->Local

71 files changed, 186 insertions, 186 deletions

diff --git a/java/build.xml b/java/build.xml
index 2012ab9c53a..3cbcfd3c25b 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -37,7 +37,7 @@
                 <include name="Current.ice" />
                 <include name="Identity.ice" />
                 <include name="Facet.ice" />
-                <include name="RuntimeException.ice" />
+                <include name="LocalException.ice" />
                 <include name="Logger.ice" />
                 <include name="ObjectAdapter.ice" />
                 <include name="ObjectFactory.ice" />
diff --git a/java/demo/Freeze/library/Parser.java b/java/demo/Freeze/library/Parser.java
index 6a1557e3de6..7fc771c49e8 100644
--- a/java/demo/Freeze/library/Parser.java
+++ b/java/demo/Freeze/library/Parser.java
@@ -61,7 +61,7 @@ class Parser
 	{
 	    error("the book already exists.");
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -97,7 +97,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -123,7 +123,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -170,7 +170,7 @@ class Parser
 		System.out.println("no current book");
 	    }
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -201,7 +201,7 @@ class Parser
 	{
 	    System.out.println("the book has already been rented.");
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -226,7 +226,7 @@ class Parser
 	{
 	    System.out.println("the book is not currently rented.");
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -251,7 +251,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -279,7 +279,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -292,7 +292,7 @@ class Parser
 	{
 	    _library.shutdown();
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java
index 79995916152..cfe787c6806 100644
--- a/java/demo/Freeze/phonebook/Parser.java
+++ b/java/demo/Freeze/phonebook/Parser.java
@@ -59,7 +59,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -86,7 +86,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -119,7 +119,7 @@ class Parser
 		System.out.println("no current contact");
 	    }
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -151,7 +151,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -179,7 +179,7 @@ class Parser
 		System.out.println( "no current contact" );
 	    }
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -208,7 +208,7 @@ class Parser
 		System.out.println( "no current contact" );
 	    }
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -233,7 +233,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -261,7 +261,7 @@ class Parser
 	{
 	    error(ex.message);
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
@@ -274,7 +274,7 @@ class Parser
 	{
 	    _phoneBook.shutdown();
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    error(ex.toString());
 	}
diff --git a/java/demo/Glacier/session/Client.java b/java/demo/Glacier/session/Client.java
index 34402e98f37..96a1d928bd5 100644
--- a/java/demo/Glacier/session/Client.java
+++ b/java/demo/Glacier/session/Client.java
@@ -216,7 +216,7 @@ public class Client
             {
                 ex.printStackTrace();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
             }
@@ -239,7 +239,7 @@ public class Client
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -251,7 +251,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/Glacier/session/Server.java b/java/demo/Glacier/session/Server.java
index 5b8acb45168..deb2dce078a 100644
--- a/java/demo/Glacier/session/Server.java
+++ b/java/demo/Glacier/session/Server.java
@@ -61,7 +61,7 @@ public class Server
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -73,7 +73,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java
index 7f7c8c299cf..70d4261c44b 100644
--- a/java/demo/Ice/callback/CallbackClient.java
+++ b/java/demo/Ice/callback/CallbackClient.java
@@ -190,7 +190,7 @@ class CallbackClient extends Ice.Application
             {
                 ex.printStackTrace();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
             }
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index cd4cae92063..d9db4fdf8b4 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -161,7 +161,7 @@ public class Client
             {
                 ex.printStackTrace();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
             }
@@ -184,7 +184,7 @@ public class Client
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -196,7 +196,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/Ice/hello/Server.java b/java/demo/Ice/hello/Server.java
index a074f044ede..3288668a271 100644
--- a/java/demo/Ice/hello/Server.java
+++ b/java/demo/Ice/hello/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index e06d4bd8db1..a4e9e7113dd 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -64,7 +64,7 @@ public class Client
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -76,7 +76,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/Ice/latency/Server.java b/java/demo/Ice/latency/Server.java
index 0843baf08ec..c5b1cceb9f8 100644
--- a/java/demo/Ice/latency/Server.java
+++ b/java/demo/Ice/latency/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java
index 73c8f29e232..a455d34e6c2 100644
--- a/java/demo/Ice/nested/NestedClient.java
+++ b/java/demo/Ice/nested/NestedClient.java
@@ -68,7 +68,7 @@ class NestedClient extends Ice.Application
             {
                 ex.printStackTrace();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
             }
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index 1c516ad8de9..c5400db0aae 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -187,7 +187,7 @@ public class Client
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -199,7 +199,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/Ice/value/Server.java b/java/demo/Ice/value/Server.java
index 4121a8513a9..7e10a2c824b 100644
--- a/java/demo/Ice/value/Server.java
+++ b/java/demo/Ice/value/Server.java
@@ -34,7 +34,7 @@ public class Server
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index df2157a1fea..50a5cd0e245 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -156,7 +156,7 @@ public class Client
             {
                 ex.printStackTrace();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
             }
@@ -179,7 +179,7 @@ public class Client
             communicator = Ice.Util.initializeWithProperties(args, properties);
             status = run(args, communicator);
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -191,7 +191,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/src/Freeze/Application.java b/java/src/Freeze/Application.java
index 447b068268d..0cdf012a751 100644
--- a/java/src/Freeze/Application.java
+++ b/java/src/Freeze/Application.java
@@ -34,7 +34,7 @@ public abstract class Application extends Ice.Application
 	    System.err.println(appName() + ": " + ex + ": " + ex.message);
 	    status = 1;
 	}
-	catch(Ice.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    System.err.println(appName() + ": " + ex);
 	    ex.printStackTrace();
diff --git a/java/src/Ice/Application.java b/java/src/Ice/Application.java
index 19d23c10e4f..faa1c836b7c 100644
--- a/java/src/Ice/Application.java
+++ b/java/src/Ice/Application.java
@@ -60,7 +60,7 @@ public abstract class Application
             }
             status = run(argHolder.value);
         }
-        catch(RuntimeException ex)
+        catch(LocalException ex)
         {
             System.err.println(_appName + ": " + ex);
             ex.printStackTrace();
@@ -79,7 +79,7 @@ public abstract class Application
             {
                 _communicator.destroy();
             }
-            catch(RuntimeException ex)
+            catch(LocalException ex)
             {
                 System.err.println(_appName + ": " + ex);
                 ex.printStackTrace();
diff --git a/java/src/Ice/RuntimeException.java b/java/src/Ice/LocalException.java
index bf1fecfed00..9e1f547efda 100644
--- a/java/src/Ice/RuntimeException.java
+++ b/java/src/Ice/LocalException.java
@@ -10,7 +10,7 @@
 
 package Ice;
 
-public abstract class RuntimeException extends java.lang.RuntimeException
+public abstract class LocalException extends RuntimeException
 {
     public abstract String
     ice_name();
diff --git a/java/src/Ice/LocationForward.java b/java/src/Ice/LocationForward.java
index 66713da5d8b..d55d6966368 100644
--- a/java/src/Ice/LocationForward.java
+++ b/java/src/Ice/LocationForward.java
@@ -14,7 +14,7 @@ package Ice;
 // LocationForward must be an unchecked exception, because it can
 // be thrown from any servant operation
 //
-public class LocationForward extends java.lang.RuntimeException
+public class LocationForward extends RuntimeException
 {
     public
     LocationForward(ObjectPrx prx)
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 7de76f3769f..a7ee31930de 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -439,7 +439,7 @@ public class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapter
                 beg = end + 1;
             }
         }
-        catch(RuntimeException ex)
+        catch(LocalException ex)
         {
 	    deactivate();
             throw ex;
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index b0b1ab40f41..1d9c733c64e 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -49,7 +49,7 @@ public class ObjectPrxHelper implements ObjectPrx
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch(RuntimeException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -82,7 +82,7 @@ public class ObjectPrxHelper implements ObjectPrx
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch(RuntimeException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -114,7 +114,7 @@ public class ObjectPrxHelper implements ObjectPrx
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch(RuntimeException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -146,7 +146,7 @@ public class ObjectPrxHelper implements ObjectPrx
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch(RuntimeException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -178,7 +178,7 @@ public class ObjectPrxHelper implements ObjectPrx
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch(RuntimeException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -218,7 +218,7 @@ public class ObjectPrxHelper implements ObjectPrx
                     __rethrowException(__ex.get());
                 }
             }
-            catch(RuntimeException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -507,7 +507,7 @@ public class ObjectPrxHelper implements ObjectPrx
     }
 
     public final int
-    __handleException(RuntimeException ex, int cnt)
+    __handleException(LocalException ex, int cnt)
     {
 	//
 	// Only _delegate needs to be mutex protected here.
@@ -582,7 +582,7 @@ public class ObjectPrxHelper implements ObjectPrx
     }
 
     public final synchronized void
-    __rethrowException(RuntimeException ex)
+    __rethrowException(LocalException ex)
     {
         _delegate = null;
 
diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
index 94059176205..390c6e70bdb 100644
--- a/java/src/Ice/_ObjectDelD.java
+++ b/java/src/Ice/_ObjectDelD.java
@@ -27,13 +27,13 @@ public class _ObjectDelD implements _ObjectDel
                 {
                     return __direct.facetServant().ice_isA(__id, __current);
                 }
-                catch(RuntimeException ex)
+                catch(LocalException ex)
                 {
-                    UnknownRuntimeException e = new UnknownRuntimeException();
+                    UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch(java.lang.RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
@@ -63,13 +63,13 @@ public class _ObjectDelD implements _ObjectDel
                     __direct.facetServant().ice_ping(__current);
                     return;
                 }
-                catch(RuntimeException ex)
+                catch(LocalException ex)
                 {
-                    UnknownRuntimeException e = new UnknownRuntimeException();
+                    UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch(java.lang.RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
@@ -98,13 +98,13 @@ public class _ObjectDelD implements _ObjectDel
                 {
                     return __direct.facetServant().ice_ids(__current);
                 }
-                catch(RuntimeException ex)
+                catch(LocalException ex)
                 {
-                    UnknownRuntimeException e = new UnknownRuntimeException();
+                    UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch(java.lang.RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
@@ -133,13 +133,13 @@ public class _ObjectDelD implements _ObjectDel
                 {
                     return __direct.facetServant().ice_id(__current);
                 }
-                catch(RuntimeException ex)
+                catch(LocalException ex)
                 {
-                    UnknownRuntimeException e = new UnknownRuntimeException();
+                    UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch(java.lang.RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
@@ -168,13 +168,13 @@ public class _ObjectDelD implements _ObjectDel
                 {
                     return __direct.facetServant().ice_facets(__current);
                 }
-                catch(RuntimeException ex)
+                catch(LocalException ex)
                 {
-                    UnknownRuntimeException e = new UnknownRuntimeException();
+                    UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch(java.lang.RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
@@ -215,13 +215,13 @@ public class _ObjectDelD implements _ObjectDel
                 {
                     return __servant.ice_invoke(inParams, outParams, current);
                 }
-                catch(RuntimeException ex)
+                catch(LocalException ex)
                 {
-                    UnknownRuntimeException e = new UnknownRuntimeException();
+                    UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch(java.lang.RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java
index 9f1fb529bbb..443b39bcd3d 100644
--- a/java/src/Ice/_ObjectDelM.java
+++ b/java/src/Ice/_ObjectDelM.java
@@ -252,7 +252,7 @@ public class _ObjectDelM implements _ObjectDel
 		    assert(__connection != null);
 		    __connection.incProxyUsageCount();
 		}
-		catch (RuntimeException ex)
+		catch (LocalException ex)
 		{
 		    if(__reference.routerInfo == null && __reference.endpoints.length == 0)
 		    {
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index 3234b1813b9..055bd1c563c 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -131,7 +131,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp
             stopAll();
             return 1;
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             java.io.StringWriter sw = new java.io.StringWriter();
             java.io.PrintWriter pw = new java.io.PrintWriter(sw);
diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index 0cf722ac830..ec025e0ffc5 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -141,7 +141,7 @@ public final class Connection extends EventHandler
                 TraceUtil.traceRequest("sending request", os, _logger, _traceLevels);
                 _transceiver.write(os, _endpoint.timeout());
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
 		assert(_exception != null);
@@ -255,7 +255,7 @@ public final class Connection extends EventHandler
                 _batchStream.destroy();
                 _batchStream = new BasicStream(_instance);
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
 		assert(_exception != null);
@@ -497,7 +497,7 @@ public final class Connection extends EventHandler
                     }
                 }
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
                 return;
@@ -542,7 +542,7 @@ public final class Connection extends EventHandler
                         {
                             in.invoke(response);
                         }
-                        catch(Ice.RuntimeException ex)
+                        catch(Ice.LocalException ex)
                         {
                             _mutex.lock();
                             reclaimIncoming(in);
@@ -579,7 +579,7 @@ public final class Connection extends EventHandler
                     }
                     while(batch && is.pos() < is.size());
                 }
-                catch(Ice.RuntimeException ex)
+                catch(Ice.LocalException ex)
                 {
                     _mutex.lock();
                     reclaimIncoming(in);
@@ -624,7 +624,7 @@ public final class Connection extends EventHandler
                                 closeConnection();
                             }
                         }
-                        catch(Ice.RuntimeException ex)
+                        catch(Ice.LocalException ex)
                         {
                             setState(StateClosed, ex);
                             return;
@@ -677,7 +677,7 @@ public final class Connection extends EventHandler
     }
 
     public void
-    exception(Ice.RuntimeException ex)
+    exception(Ice.LocalException ex)
     {
         _mutex.lock();
         try
@@ -730,7 +730,7 @@ public final class Connection extends EventHandler
 		{
 		    validateConnection();
 		}
-		catch(Ice.RuntimeException ex)
+		catch(Ice.LocalException ex)
 		{
 		    if(_warn)
 		    {
@@ -809,7 +809,7 @@ public final class Connection extends EventHandler
     private static final int StateClosed = 3;
 
     private void
-    setState(int state, Ice.RuntimeException ex)
+    setState(int state, Ice.LocalException ex)
     {
         if(_state == state) // Don't switch twice.
         {
@@ -948,7 +948,7 @@ public final class Connection extends EventHandler
             {
                 closeConnection();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
             }
@@ -1087,7 +1087,7 @@ public final class Connection extends EventHandler
     private final boolean _warn;
     private int _nextRequestId;
     private IntMap _requests = new IntMap();
-    private Ice.RuntimeException _exception;
+    private Ice.LocalException _exception;
     private BasicStream _batchStream;
     private int _responseCount;
     private int _proxyUsageCount;
diff --git a/java/src/IceInternal/DispatchStatus.java b/java/src/IceInternal/DispatchStatus.java
index 3967bec1c81..e50a3211609 100644
--- a/java/src/IceInternal/DispatchStatus.java
+++ b/java/src/IceInternal/DispatchStatus.java
@@ -27,8 +27,8 @@ public final class DispatchStatus
     public static final DispatchStatus DispatchFacetNotExist = new DispatchStatus(_DispatchFacetNotExist);
     public static final int _DispatchOperationNotExist = 5;
     public static final DispatchStatus DispatchOperationNotExist = new DispatchStatus(_DispatchOperationNotExist);
-    public static final int _DispatchUnknownRuntimeException = 6;
-    public static final DispatchStatus DispatchUnknownRuntimeException = new DispatchStatus(_DispatchUnknownRuntimeException);
+    public static final int _DispatchUnknownLocalException = 6;
+    public static final DispatchStatus DispatchUnknownLocalException = new DispatchStatus(_DispatchUnknownLocalException);
     public static final int _DispatchUnknownUserException = 7;
     public static final DispatchStatus DispatchUnknownUserException = new DispatchStatus(_DispatchUnknownUserException);
     public static final int _DispatchUnknownException = 8;
diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java
index c088df1dc30..09d937c8e7c 100644
--- a/java/src/IceInternal/EventHandler.java
+++ b/java/src/IceInternal/EventHandler.java
@@ -38,7 +38,7 @@ abstract class EventHandler
     //
     // Propagate an exception to the event handler.
     //
-    abstract public void exception(Ice.RuntimeException ex);
+    abstract public void exception(Ice.LocalException ex);
 
     //
     // Get a textual representation of the event handler.
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index 0e9ffb03878..05682f38d46 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -236,7 +236,7 @@ public class Incoming
 	    // Rethrow, so that the caller can print a warning.
             throw ex;
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             if(locator != null && servant != null)
             {
@@ -250,7 +250,7 @@ public class Incoming
                 _os.endWriteEncaps();
                 _os.resize(statusPos, false);
                 _os.writeByte(
-                    (byte)DispatchStatus._DispatchUnknownRuntimeException);
+                    (byte)DispatchStatus._DispatchUnknownLocalException);
             }
 
 	    // Rethrow, so that the caller can print a warning.
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index 631e47d9b5f..21b7fb9026f 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -116,7 +116,7 @@ public class IncomingConnectionFactory extends EventHandler
             // Ignore timeouts.
 	    return;
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             if(_warn)
             {
@@ -136,7 +136,7 @@ public class IncomingConnectionFactory extends EventHandler
             connection.activate();
             _connections.add(connection);
 	}
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
 	{
 	    //
 	    // Ignore all exceptions while creating or activating the
@@ -172,7 +172,7 @@ public class IncomingConnectionFactory extends EventHandler
     }
 
     public void
-    exception(Ice.RuntimeException ex)
+    exception(Ice.LocalException ex)
     {
         assert(false); // Must not be called.
     }
@@ -384,7 +384,7 @@ public class IncomingConnectionFactory extends EventHandler
     }
 
     private void
-    warning(Ice.RuntimeException ex)
+    warning(Ice.LocalException ex)
     {
         java.io.StringWriter sw = new java.io.StringWriter();
         java.io.PrintWriter pw = new java.io.PrintWriter(sw);
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index cbbf523763c..1e61d5e38f1 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -188,7 +188,7 @@ public class Instance
 
             _bufferManager = new BufferManager(); // Must be created before the ThreadPool
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             destroy();
             throw ex;
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java
index 017274eb3f5..a9c8f81e157 100644
--- a/java/src/IceInternal/LocatorInfo.java
+++ b/java/src/IceInternal/LocatorInfo.java
@@ -88,7 +88,7 @@ public final class LocatorInfo
 			endpoints = ((Ice.ObjectPrxHelper)object).__reference().endpoints;
 		    }
 		}
-		catch(Ice.RuntimeException ex)
+		catch(Ice.LocalException ex)
 		{
 		    //
 		    // Just trace the failure. The proxy will most
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index 7fb0981252e..402e8c4fc53 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -436,7 +436,7 @@ public final class Network
                 doConnect(sink, addr, -1);
                 fds.source = doAccept(fd, -1);
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 try
                 {
diff --git a/java/src/IceInternal/NonRepeatable.java b/java/src/IceInternal/NonRepeatable.java
index 64e04b1060a..f1963b4eb80 100644
--- a/java/src/IceInternal/NonRepeatable.java
+++ b/java/src/IceInternal/NonRepeatable.java
@@ -13,16 +13,16 @@ package IceInternal;
 public class NonRepeatable extends Exception
 {
     public
-    NonRepeatable(Ice.RuntimeException ex)
+    NonRepeatable(Ice.LocalException ex)
     {
         _ex = ex;
     }
 
-    public Ice.RuntimeException
+    public Ice.LocalException
     get()
     {
         return _ex;
     }
 
-    private Ice.RuntimeException _ex;
+    private Ice.LocalException _ex;
 }
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 8ea8d41fe11..be522da8b84 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -80,7 +80,7 @@ public final class Outgoing
                                 if(_state == StateInProgress)
                                 {
                                     timedOut = true;
-                                    _state = StateRuntimeException;
+                                    _state = StateLocalException;
                                     _exception = new Ice.TimeoutException();
                                 }
                             }
@@ -221,7 +221,7 @@ public final class Outgoing
 
                 case DispatchStatus._DispatchObjectNotExist:
                 {
-                    _state = StateRuntimeException;
+                    _state = StateLocalException;
                     Ice.ObjectNotExistException ex = new Ice.ObjectNotExistException();
 		    ex.id = new Ice.Identity();
 		    ex.id.__read(_is);
@@ -232,7 +232,7 @@ public final class Outgoing
 
                 case DispatchStatus._DispatchFacetNotExist:
                 {
-                    _state = StateRuntimeException;
+                    _state = StateLocalException;
                     Ice.FacetNotExistException ex = new Ice.FacetNotExistException();
 		    ex.facet = _is.readStringSeq();
 		    _exception = ex;
@@ -242,7 +242,7 @@ public final class Outgoing
 
                 case DispatchStatus._DispatchOperationNotExist:
                 {
-                    _state = StateRuntimeException;
+                    _state = StateLocalException;
                     Ice.OperationNotExistException ex = new Ice.OperationNotExistException();
 		    ex.operation = _is.readString();
 		    _exception = ex;
@@ -250,17 +250,17 @@ public final class Outgoing
                     break;
                 }
 
-                case DispatchStatus._DispatchUnknownRuntimeException:
+                case DispatchStatus._DispatchUnknownLocalException:
                 {
-                    _state = StateRuntimeException;
-                    _exception = new Ice.UnknownRuntimeException();
+                    _state = StateLocalException;
+                    _exception = new Ice.UnknownLocalException();
                     _fillStackTrace = true;
                     break;
                 }
 
                 case DispatchStatus._DispatchUnknownUserException:
                 {
-                    _state = StateRuntimeException;
+                    _state = StateLocalException;
                     _exception = new Ice.UnknownUserException();
                     _fillStackTrace = true;
                     break;
@@ -268,7 +268,7 @@ public final class Outgoing
 
                 case DispatchStatus._DispatchUnknownException:
                 {
-                    _state = StateRuntimeException;
+                    _state = StateLocalException;
                     _exception = new Ice.UnknownException();
                     _fillStackTrace = true;
                     break;
@@ -276,7 +276,7 @@ public final class Outgoing
 
                 default:
                 {
-                    _state = StateRuntimeException;
+                    _state = StateLocalException;
                     _exception = new Ice.UnknownReplyStatusException();
                     _fillStackTrace = true;
                     break;
@@ -287,11 +287,11 @@ public final class Outgoing
     }
 
     public synchronized void
-    finished(Ice.RuntimeException ex)
+    finished(Ice.LocalException ex)
     {
         if(_state == StateInProgress)
         {
-            _state = StateRuntimeException;
+            _state = StateLocalException;
             _exception = ex;
             notify();
         }
@@ -364,7 +364,7 @@ public final class Outgoing
 
     private Connection _connection;
     private Reference _reference;
-    private Ice.RuntimeException _exception;
+    private Ice.LocalException _exception;
     private boolean _fillStackTrace;
 
     private static final int StateUnsent = 0;
@@ -372,7 +372,7 @@ public final class Outgoing
     private static final int StateOK = 2;
     private static final int StateLocationForward = 3;
     private static final int StateUserException = 4;
-    private static final int StateRuntimeException = 5;
+    private static final int StateLocalException = 5;
     private int _state;
 
     private BasicStream _is;
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index a1f58bc58a3..1a743ade447 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -61,7 +61,7 @@ public class OutgoingConnectionFactory
         Ice.Logger logger = _instance.logger();
 
         Connection connection = null;
-        Ice.RuntimeException exception = null;
+        Ice.LocalException exception = null;
         for(int i = 0; i < endpoints.length; i++)
         {
   	    Endpoint endpoint = endpoints[i];
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index a04ca12887c..8354cff247c 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -591,7 +591,7 @@ public final class ThreadPool
 		    {
 			handler.finished(this);
 		    }
-		    catch(Ice.RuntimeException ex)
+		    catch(Ice.LocalException ex)
 		    {
 			java.io.StringWriter sw = new java.io.StringWriter();
 			java.io.PrintWriter pw = new java.io.PrintWriter(sw);
@@ -627,7 +627,7 @@ public final class ThreadPool
                             {
                                 continue repeatSelect;
                             }
-                            catch(Ice.RuntimeException ex)
+                            catch(Ice.LocalException ex)
                             {
                                 if(TRACE_EXCEPTION)
                                 {
@@ -898,7 +898,7 @@ public final class ThreadPool
             {
 		ThreadPool.this.run(stream);
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 java.io.StringWriter sw = new java.io.StringWriter();
                 java.io.PrintWriter pw = new java.io.PrintWriter(sw);
diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java
index b58522dfe85..4ebb46a776c 100644
--- a/java/src/IceInternal/TraceUtil.java
+++ b/java/src/IceInternal/TraceUtil.java
@@ -118,7 +118,7 @@ final class TraceUtil
                     s.write("(operation not exist)");
                     break;
                 }
-                case DispatchStatus._DispatchUnknownRuntimeException:
+                case DispatchStatus._DispatchUnknownLocalException:
                 {
                     s.write("(unknown local exception)");
                     break;
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 5c9db40cb54..201e814fade 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -201,7 +201,7 @@ final class UdpTransceiver implements Transceiver
                 _logger.trace(_traceLevels.networkCat, s);
             }
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             _fd = null;
             throw ex;
@@ -231,7 +231,7 @@ final class UdpTransceiver implements Transceiver
                 _logger.trace(_traceLevels.networkCat, s);
             }
         }
-        catch(Ice.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             _fd = null;
             throw ex;
diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java
index 97d032f292a..ee721c04f4f 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.RuntimeException ex)
+	    catch(Ice.LocalException 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 c4240d24068..f9f1066dcf0 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.RuntimeException ex)
+	    catch(Ice.LocalException 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 de3f92ec40e..07e8485c077 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.RuntimeException ex)
+            catch(Ice.LocalException 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.RuntimeException ex)
+            catch(Ice.LocalException 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.RuntimeException ex)
+	    catch(Ice.LocalException 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 66efc345be0..e1f6027cb50 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.UnknownRuntimeException ex)
+        catch(Ice.UnknownLocalException ex)
         {
             System.out.println("ok");
         }
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
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index d1127b22c3c..e700d7004d0 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.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/facets/Collocated.java b/java/test/Ice/facets/Collocated.java
index 579a1b08693..352fedc80d7 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -52,7 +52,7 @@ public class Collocated
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index 4916b023cea..e7fe97165b3 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -53,7 +53,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index 9e27b2c327b..ea57971e94d 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -86,7 +86,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index f893b890542..6198d5edce9 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -88,7 +88,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index 7e51cb3e1f9..54fd01a860b 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.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/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java
index 4c9f51f4186..b23c19017d9 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.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/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 6ca4ff42c2a..524385b4c00 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -45,7 +45,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 33d3dd640f2..16a5507567e 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.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	    test(false);
 	}
diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index d592ba87814..b5aba44d35b 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.RuntimeException ex)
+        catch (Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -42,7 +42,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch (Ice.RuntimeException ex)
+            catch (Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index f7a7ef32d4e..ba4dc54ef95 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -67,7 +67,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/locationForward/Client.java b/java/test/Ice/locationForward/Client.java
index bb98618dc79..0a0f6482e7d 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -101,7 +101,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/locationForward/Server.java b/java/test/Ice/locationForward/Server.java
index fdf962fa742..baa44b0b824 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -105,7 +105,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index 6ccb4bb13ad..3f715c262a3 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java
index bb99a16eecf..3b14d86c061 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.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/objects/Server.java b/java/test/Ice/objects/Server.java
index 6ca4ff42c2a..524385b4c00 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -45,7 +45,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 413569e88e8..bb4068c4c09 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -58,7 +58,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index 5004ba15206..fb99b620d2a 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.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/operations/Server.java b/java/test/Ice/operations/Server.java
index 61e3ecb9395..768313556d6 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -45,7 +45,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IcePack/deployer/AllTests.java b/java/test/IcePack/deployer/AllTests.java
index 24ce8ce75ed..a9f1b4db7ab 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.RuntimeException ex)
+	catch(Ice.LocalException ex)
 	{
 	}
 
diff --git a/java/test/IcePack/deployer/Client.java b/java/test/IcePack/deployer/Client.java
index 620ab63f33f..df735d6728c 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.RuntimeException ex)
+        catch (Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -58,7 +58,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch (Ice.RuntimeException ex)
+            catch (Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java
index a9dcd47b942..d26065b1f80 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.RuntimeException ex)
+        catch (Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -46,7 +46,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch (Ice.RuntimeException ex)
+            catch (Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IcePack/simple/Server.java b/java/test/IcePack/simple/Server.java
index 673b64df328..11e1d3ff2f1 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.RuntimeException ex)
+        catch (Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -48,7 +48,7 @@ public class Server
             {
                 communicator.destroy();
             }
-            catch (Ice.RuntimeException ex)
+            catch (Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/test/IceXML/encoding/Client.java b/java/test/IceXML/encoding/Client.java
index 1203c6c728b..95356fc0cd0 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.RuntimeException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -624,7 +624,7 @@ public class Client
             {
                 communicator.destroy();
             }
-            catch(Ice.RuntimeException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;