removed spaces

34 files changed, 217 insertions, 217 deletions

diff --git a/java/src/Freeze/ShutdownHook.java b/java/src/Freeze/ShutdownHook.java
index 2155e445350..81e9855e8bc 100644
--- a/java/src/Freeze/ShutdownHook.java
+++ b/java/src/Freeze/ShutdownHook.java
@@ -24,7 +24,7 @@ public class ShutdownHook extends Thread
         {
             _env.close();
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             ex.printStackTrace();
         }
diff --git a/java/src/Ice/LocalObject.java b/java/src/Ice/LocalObject.java
index a16f5c641ac..fadfd5adbf1 100644
--- a/java/src/Ice/LocalObject.java
+++ b/java/src/Ice/LocalObject.java
@@ -20,7 +20,7 @@ public abstract class LocalObject
             LocalObject r = (LocalObject)rhs;
             return this == r;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
         }
         return false;
diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java
index b402b900f9d..451c922a6ac 100644
--- a/java/src/Ice/Object.java
+++ b/java/src/Ice/Object.java
@@ -25,7 +25,7 @@ public class Object
             Object r = (Object)rhs;
             return this == r;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
         }
         return false;
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index f9dfaaf8dd0..fbb9e43edc2 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -369,7 +369,7 @@ public class ObjectAdapterI implements ObjectAdapter
                 beg = end + 1;
             }
         }
-        catch (LocalException ex)
+        catch(LocalException ex)
         {
 	    deactivate();
             throw ex;
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index f3847df04e2..1534b0a4e68 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -41,15 +41,15 @@ public class ObjectPrxHelper implements ObjectPrx
                 _ObjectDel __del = __getDelegate();
                 return __del.ice_isA(__id, __context);
             }
-            catch (LocationForward __ex)
+            catch(LocationForward __ex)
             {
                 __locationForward(__ex);
             }
-            catch (IceInternal.NonRepeatable __ex)
+            catch(IceInternal.NonRepeatable __ex)
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch (LocalException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -74,15 +74,15 @@ public class ObjectPrxHelper implements ObjectPrx
                 __del.ice_ping(__context);
                 return;
             }
-            catch (LocationForward __ex)
+            catch(LocationForward __ex)
             {
                 __locationForward(__ex);
             }
-            catch (IceInternal.NonRepeatable __ex)
+            catch(IceInternal.NonRepeatable __ex)
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch (LocalException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -106,15 +106,15 @@ public class ObjectPrxHelper implements ObjectPrx
                 _ObjectDel __del = __getDelegate();
                 return __del.ice_ids(__context);
             }
-            catch (LocationForward __ex)
+            catch(LocationForward __ex)
             {
                 __locationForward(__ex);
             }
-            catch (IceInternal.NonRepeatable __ex)
+            catch(IceInternal.NonRepeatable __ex)
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch (LocalException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -138,15 +138,15 @@ public class ObjectPrxHelper implements ObjectPrx
                 _ObjectDel __del = __getDelegate();
                 return __del.ice_id(__context);
             }
-            catch (LocationForward __ex)
+            catch(LocationForward __ex)
             {
                 __locationForward(__ex);
             }
-            catch (IceInternal.NonRepeatable __ex)
+            catch(IceInternal.NonRepeatable __ex)
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch (LocalException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -170,15 +170,15 @@ public class ObjectPrxHelper implements ObjectPrx
                 _ObjectDel __del = __getDelegate();
                 return __del.ice_facets(__context);
             }
-            catch (LocationForward __ex)
+            catch(LocationForward __ex)
             {
                 __locationForward(__ex);
             }
-            catch (IceInternal.NonRepeatable __ex)
+            catch(IceInternal.NonRepeatable __ex)
             {
                 __cnt = __handleException(__ex.get(), __cnt);
             }
-            catch (LocalException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -203,11 +203,11 @@ public class ObjectPrxHelper implements ObjectPrx
                 _ObjectDel __del = __getDelegate();
                 return __del.ice_invoke(operation, nonmutating, inParams, outParams, __context);
             }
-            catch (LocationForward __ex)
+            catch(LocationForward __ex)
             {
                 __locationForward(__ex);
             }
-            catch (IceInternal.NonRepeatable __ex)
+            catch(IceInternal.NonRepeatable __ex)
             {
                 if(nonmutating)
                 {
@@ -218,7 +218,7 @@ public class ObjectPrxHelper implements ObjectPrx
                     __rethrowException(__ex.get());
                 }
             }
-            catch (LocalException __ex)
+            catch(LocalException __ex)
             {
                 __cnt = __handleException(__ex, __cnt);
             }
@@ -446,14 +446,14 @@ public class ObjectPrxHelper implements ObjectPrx
             {
                 delegateM = (_ObjectDelM)h._delegate;
             }
-            catch (ClassCastException ex)
+            catch(ClassCastException ex)
             {
             }
             try
             {
                 delegateD = (_ObjectDelD)h._delegate;
             }
-            catch (ClassCastException ex)
+            catch(ClassCastException ex)
             {
             }
         }
@@ -490,7 +490,7 @@ public class ObjectPrxHelper implements ObjectPrx
         {
             throw ex;
         }
-        catch (CloseConnectionException e)
+        catch(CloseConnectionException e)
         {
             //
             // We always retry on a close connection exception, as this
@@ -498,15 +498,15 @@ public class ObjectPrxHelper implements ObjectPrx
             //
             // TODO: configurable timeout before we try again?
         }
-        catch (SocketException e)
+        catch(SocketException e)
         {
             ++cnt;
         }
-        catch (DNSException e)
+        catch(DNSException e)
         {
             ++cnt;
         }
-        catch (TimeoutException e)
+        catch(TimeoutException e)
         {
             ++cnt;
         }
diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java
index f1450372612..42a8bc67d78 100644
--- a/java/src/Ice/PluginManagerI.java
+++ b/java/src/Ice/PluginManagerI.java
@@ -122,7 +122,7 @@ public final class PluginManagerI implements PluginManager
             {
                 factory = (PluginFactory)obj;
             }
-            catch (ClassCastException ex)
+            catch(ClassCastException ex)
             {
                 PluginInitializationException e = new PluginInitializationException();
                 e.reason = "class " + className + " does not implement Ice.PluginFactory";
@@ -130,21 +130,21 @@ public final class PluginManagerI implements PluginManager
                 throw e;
             }
         }
-        catch (ClassNotFoundException ex)
+        catch(ClassNotFoundException ex)
         {
             PluginInitializationException e = new PluginInitializationException();
             e.reason = "class " + className + " not found";
             e.initCause(ex);
             throw e;
         }
-        catch (IllegalAccessException ex)
+        catch(IllegalAccessException ex)
         {
             PluginInitializationException e = new PluginInitializationException();
             e.reason = "unable to access default constructor in class " + className;
             e.initCause(ex);
             throw e;
         }
-        catch (InstantiationException ex)
+        catch(InstantiationException ex)
         {
             PluginInitializationException e = new PluginInitializationException();
             e.reason = "unable to instantiate class " + className;
@@ -160,7 +160,7 @@ public final class PluginManagerI implements PluginManager
         {
             plugin = factory.create(_instance.communicator(), name, args);
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             PluginInitializationException e = new PluginInitializationException();
             e.reason = "exception in factory " + className;
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index 67560da00b1..21e8797b72a 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -65,7 +65,7 @@ class PropertiesI implements Properties
 	{
 	    return Integer.parseInt(result);
 	}
-	catch (NumberFormatException ex)
+	catch(NumberFormatException ex)
 	{
 	    return 0;
 	}
@@ -145,7 +145,7 @@ class PropertiesI implements Properties
             java.io.BufferedReader br = new java.io.BufferedReader(fr);
             parse(br);
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             SystemException se = new SystemException();
             se.initCause(ex); // Exception chaining
@@ -219,7 +219,7 @@ class PropertiesI implements Properties
                 parseLine(line);
             }
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             SystemException se = new SystemException();
             se.initCause(ex); // Exception chaining
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 3fb786a3505..e5c13b88fee 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -146,7 +146,7 @@ public final class Util
             {
                 addr = java.net.InetAddress.getLocalHost();
             }
-            catch (java.net.UnknownHostException ex)
+            catch(java.net.UnknownHostException ex)
             {
                 throw new DNSException();
             }
diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
index f860f2bdc55..0f9c77bcafb 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 (LocalException ex)
+                catch(LocalException ex)
                 {
                     UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch (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 (LocalException ex)
+                catch(LocalException ex)
                 {
                     UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch (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 (LocalException ex)
+                catch(LocalException ex)
                 {
                     UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch (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 (LocalException ex)
+                catch(LocalException ex)
                 {
                     UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch (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 (LocalException ex)
+                catch(LocalException ex)
                 {
                     UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch (RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
@@ -204,7 +204,7 @@ public class _ObjectDelD implements _ObjectDel
                 {
                     __servant = (Blobject)__direct.facetServant();
                 }
-                catch (ClassCastException ex)
+                catch(ClassCastException ex)
                 {
                     OperationNotExistException opEx = new OperationNotExistException();
 		    opEx.operation = current.operation;
@@ -214,13 +214,13 @@ public class _ObjectDelD implements _ObjectDel
                 {
                     return __servant.ice_invoke(inParams, outParams, current);
                 }
-                catch (LocalException ex)
+                catch(LocalException ex)
                 {
                     UnknownLocalException e = new UnknownLocalException();
                     e.initCause(ex);
                     throw e;
                 }
-                catch (RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     UnknownException e = new UnknownException();
                     e.initCause(ex);
diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java
index 192fa494f8a..61c4b195678 100644
--- a/java/src/IceBox/Server.java
+++ b/java/src/IceBox/Server.java
@@ -54,7 +54,7 @@ public final class Server
             ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator, argsH.value);
             status = serviceManagerImpl.run();
         }
-        catch (Ice.LocalException ex)
+        catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
             status = 1;
@@ -66,7 +66,7 @@ public final class Server
             {
                 communicator.destroy();
             }
-            catch (Ice.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 ex.printStackTrace();
                 status = 1;
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index f11a442872b..5ea3a969fb2 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -102,11 +102,11 @@ public final class ServiceManagerI extends _ServiceManagerDisp
                 {
                     svc.start();
                 }
-                catch (FailureException ex)
+                catch(FailureException ex)
                 {
                     throw ex;
                 }
-                catch (Exception ex)
+                catch(Exception ex)
                 {
                     FailureException e = new FailureException();
                     e.reason = "ServiceManager: exception in start for service " + name + ": " + ex;
@@ -145,7 +145,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp
             //
             stopAll();
         }
-        catch (FailureException ex)
+        catch(FailureException ex)
         {
             java.io.StringWriter sw = new java.io.StringWriter();
             java.io.PrintWriter pw = new java.io.PrintWriter(sw);
@@ -156,7 +156,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp
             stopAll();
             return 1;
         }
-        catch (Ice.LocalException ex)
+        catch(Ice.LocalException ex)
         {
             java.io.StringWriter sw = new java.io.StringWriter();
             java.io.PrintWriter pw = new java.io.PrintWriter(sw);
@@ -166,7 +166,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp
             stopAll();
             return 1;
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             java.io.StringWriter sw = new java.io.StringWriter();
             java.io.PrintWriter pw = new java.io.PrintWriter(sw);
@@ -238,28 +238,28 @@ public final class ServiceManagerI extends _ServiceManagerDisp
             {
                 svc = (Service)obj;
             }
-            catch (ClassCastException ex)
+            catch(ClassCastException ex)
             {
                 FailureException e = new FailureException();
                 e.reason = "ServiceManager: class " + className + " does not implement IceBox.Service";
                 throw e;
             }
         }
-        catch (ClassNotFoundException ex)
+        catch(ClassNotFoundException ex)
         {
             FailureException e = new FailureException();
             e.reason = "ServiceManager: class " + className + " not found";
             e.initCause(ex);
             throw e;
         }
-        catch (IllegalAccessException ex)
+        catch(IllegalAccessException ex)
         {
             FailureException e = new FailureException();
             e.reason = "ServiceManager: unable to access default constructor in class " + className;
             e.initCause(ex);
             throw e;
         }
-        catch (InstantiationException ex)
+        catch(InstantiationException ex)
         {
             FailureException e = new FailureException();
             e.reason = "ServiceManager: unable to instantiate class " + className;
@@ -275,11 +275,11 @@ public final class ServiceManagerI extends _ServiceManagerDisp
             svc.init(service, _communicator, serviceProperties, serviceArgs.value);
             _services.put(service, svc);
         }
-        catch (FailureException ex)
+        catch(FailureException ex)
         {
             throw ex;
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             FailureException e = new FailureException();
             e.reason = "ServiceManager: exception while initializing service " + service + ": " + ex;
@@ -301,7 +301,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp
         {
             svc.stop();
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             FailureException e = new FailureException();
             e.reason = "ServiceManager: exception in stop for service " + service + ": " + ex;
@@ -323,7 +323,7 @@ public final class ServiceManagerI extends _ServiceManagerDisp
             {
                 service.stop();
             }
-            catch (Exception ex)
+            catch(Exception ex)
             {
                 java.io.StringWriter sw = new java.io.StringWriter();
                 java.io.PrintWriter pw = new java.io.PrintWriter(sw);
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 0694347ea6a..1a446063ca5 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -259,7 +259,7 @@ public class BasicStream
         {
             _buf.position(start + sz);
         }
-        catch (IllegalArgumentException ex)
+        catch(IllegalArgumentException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -309,7 +309,7 @@ public class BasicStream
         {
             _buf.position(_buf.position() + sz);
         }
-        catch (IllegalArgumentException ex)
+        catch(IllegalArgumentException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -351,7 +351,7 @@ public class BasicStream
 		return (int)b;
 	    }
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -373,7 +373,7 @@ public class BasicStream
             _buf.get(v);
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -401,7 +401,7 @@ public class BasicStream
         {
             return _buf.get();
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -417,7 +417,7 @@ public class BasicStream
             _buf.get(v);
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -448,7 +448,7 @@ public class BasicStream
         {
             return _buf.get() == 1;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -467,7 +467,7 @@ public class BasicStream
             }
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -497,7 +497,7 @@ public class BasicStream
         {
             return _buf.getShort();
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -515,7 +515,7 @@ public class BasicStream
             _buf.position(_buf.position() + sz * 2);
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -545,7 +545,7 @@ public class BasicStream
         {
             return _buf.getInt();
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -563,7 +563,7 @@ public class BasicStream
             _buf.position(_buf.position() + sz * 4);
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -593,7 +593,7 @@ public class BasicStream
         {
             return _buf.getLong();
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -611,7 +611,7 @@ public class BasicStream
             _buf.position(_buf.position() + sz * 8);
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -641,7 +641,7 @@ public class BasicStream
         {
             return _buf.getFloat();
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -659,7 +659,7 @@ public class BasicStream
             _buf.position(_buf.position() + sz * 4);
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -689,7 +689,7 @@ public class BasicStream
         {
             return _buf.getDouble();
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -707,7 +707,7 @@ public class BasicStream
             _buf.position(_buf.position() + sz * 8);
             return v;
         }
-        catch (java.nio.BufferUnderflowException ex)
+        catch(java.nio.BufferUnderflowException ex)
         {
             throw new Ice.UnmarshalOutOfBoundsException();
         }
@@ -732,7 +732,7 @@ public class BasicStream
                     expand(arr.length);
                     _buf.put(arr);
                 }
-                catch (java.io.UnsupportedEncodingException ex)
+                catch(java.io.UnsupportedEncodingException ex)
                 {
                     assert(false);
                 }
@@ -800,12 +800,12 @@ public class BasicStream
                 }
                 return new String(_stringChars, 0, len);
             }
-            catch (java.io.UnsupportedEncodingException ex)
+            catch(java.io.UnsupportedEncodingException ex)
             {
                 assert(false);
                 return "";
             }
-            catch (java.nio.BufferUnderflowException ex)
+            catch(java.nio.BufferUnderflowException ex)
             {
                 throw new Ice.UnmarshalOutOfBoundsException();
             }
@@ -1000,7 +1000,7 @@ public class BasicStream
             {
                 factory.createAndThrow(id);
             }
-            catch (Ice.UserException ex)
+            catch(Ice.UserException ex)
             {
                 String[] arr = ex.__getExceptionIds();
                 for(int i = 0; !arr[i].equals("::Ice::UserException"); i++)
@@ -1078,7 +1078,7 @@ public class BasicStream
             {
                 return (Ice.Object)_class.newInstance();
             }
-            catch (Exception ex)
+            catch(Exception ex)
             {
                 Ice.SystemException e = new Ice.SystemException();
                 e.initCause(ex);
@@ -1114,11 +1114,11 @@ public class BasicStream
                 _instance.servantFactoryManager().add(factory, id);
             }
         }
-        catch (ClassNotFoundException ex)
+        catch(ClassNotFoundException ex)
         {
             // Ignore
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             Ice.NoObjectFactoryException e = new Ice.NoObjectFactoryException();
             e.initCause(ex);
@@ -1143,11 +1143,11 @@ public class BasicStream
             {
                 throw (Ice.UserException)_class.newInstance();
             }
-            catch (Ice.UserException ex)
+            catch(Ice.UserException ex)
             {
                 throw ex;
             }
-            catch (Exception ex)
+            catch(Exception ex)
             {
                 Ice.SystemException e = new Ice.SystemException();
                 e.initCause(ex);
@@ -1181,11 +1181,11 @@ public class BasicStream
             factory = new DynamicUserExceptionFactory(c);
             _instance.userExceptionFactoryManager().add(factory, id);
         }
-        catch (ClassNotFoundException ex)
+        catch(ClassNotFoundException ex)
         {
             // Ignore
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             Ice.NoUserExceptionFactoryException e = new Ice.NoUserExceptionFactoryException();
             e.initCause(ex);
diff --git a/java/src/IceInternal/BufferManager.java b/java/src/IceInternal/BufferManager.java
index f4bcb16762a..d8a50ca6714 100644
--- a/java/src/IceInternal/BufferManager.java
+++ b/java/src/IceInternal/BufferManager.java
@@ -28,7 +28,7 @@ final class BufferManager
                 //buf = java.nio.ByteBuffer.allocateDirect(size);
                 buf = java.nio.ByteBuffer.allocate(size);
             }
-            catch (OutOfMemoryError ex)
+            catch(OutOfMemoryError ex)
             {
                 Ice.MemoryLimitException e = new Ice.MemoryLimitException();
                 e.initCause(ex);
@@ -50,7 +50,7 @@ final class BufferManager
                 //buf = java.nio.ByteBuffer.allocateDirect(size);
                 buf = java.nio.ByteBuffer.allocate(size);
             }
-            catch (OutOfMemoryError ex)
+            catch(OutOfMemoryError ex)
             {
                 Ice.MemoryLimitException e = new Ice.MemoryLimitException();
                 e.initCause(ex);
diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index 2d33d022687..e4812e28f3e 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.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
                 throw ex;
@@ -254,7 +254,7 @@ public final class Connection extends EventHandler
                 _batchStream.destroy();
                 _batchStream = new BasicStream(_instance);
             }
-            catch (Ice.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
                 throw ex;
@@ -467,7 +467,7 @@ public final class Connection extends EventHandler
                     }
                 }
             }
-            catch (Ice.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
                 return;
@@ -512,7 +512,7 @@ public final class Connection extends EventHandler
                         {
                             in.invoke(response);
                         }
-                        catch (Ice.LocalException ex)
+                        catch(Ice.LocalException ex)
                         {
                             _mutex.lock();
                             reclaimIncoming(in);
@@ -529,7 +529,7 @@ public final class Connection extends EventHandler
                                 _mutex.unlock();
                             }
                         }
-                        catch (Exception ex)
+                        catch(Exception ex)
                         {
                             _mutex.lock();
                             reclaimIncoming(in);
@@ -549,7 +549,7 @@ public final class Connection extends EventHandler
                     }
                     while(batch && is.pos() < is.size());
                 }
-                catch (Ice.LocalException ex)
+                catch(Ice.LocalException ex)
                 {
                     _mutex.lock();
                     reclaimIncoming(in);
@@ -594,7 +594,7 @@ public final class Connection extends EventHandler
                                 closeConnection();
                             }
                         }
-                        catch (Ice.LocalException ex)
+                        catch(Ice.LocalException ex)
                         {
                             setState(StateClosed, ex);
                             return;
@@ -872,7 +872,7 @@ public final class Connection extends EventHandler
             {
                 closeConnection();
             }
-            catch (Ice.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 setState(StateClosed, ex);
             }
diff --git a/java/src/IceInternal/Direct.java b/java/src/IceInternal/Direct.java
index bdcdd3e0f91..1b6f37cdfd7 100644
--- a/java/src/IceInternal/Direct.java
+++ b/java/src/IceInternal/Direct.java
@@ -53,7 +53,7 @@ public final class Direct
                 }
             }
         }
-        catch (RuntimeException ex)
+        catch(RuntimeException ex)
         {
             if(_locator != null && _servant != null)
             {
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index 9feb52157fa..b54f1414bae 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -153,7 +153,7 @@ public class Incoming
                 }
             }
         }
-        catch (Ice.LocationForward ex)
+        catch(Ice.LocationForward ex)
         {
             if(locator != null && servant != null)
             {
@@ -170,7 +170,7 @@ public class Incoming
                 _os.writeProxy(ex._prx);
             }
         }
-        catch (Ice.ObjectNotExistException ex)
+        catch(Ice.ObjectNotExistException ex)
         {
             if(locator != null && servant != null)
             {
@@ -192,7 +192,7 @@ public class Incoming
 	    // Rethrow, so that the caller can print a warning.
             throw ex;
         }
-        catch (Ice.FacetNotExistException ex)
+        catch(Ice.FacetNotExistException ex)
         {
             if(locator != null && servant != null)
             {
@@ -214,7 +214,7 @@ public class Incoming
 	    // Rethrow, so that the caller can print a warning.
             throw ex;
         }
-        catch (Ice.OperationNotExistException ex)
+        catch(Ice.OperationNotExistException ex)
         {
             if(locator != null && servant != null)
             {
@@ -236,7 +236,7 @@ public class Incoming
 	    // Rethrow, so that the caller can print a warning.
             throw ex;
         }
-        catch (Ice.LocalException ex)
+        catch(Ice.LocalException ex)
         {
             if(locator != null && servant != null)
             {
@@ -257,7 +257,7 @@ public class Incoming
             throw ex;
         }
         /* Not possible in Java - UserExceptions are checked exceptions
-        catch (Ice.UserException ex)
+        catch(Ice.UserException ex)
         {
             if(locator != null && servant != null)
             {
@@ -277,7 +277,7 @@ public class Incoming
             throw ex;
         }
         */
-        catch (RuntimeException ex)
+        catch(RuntimeException ex)
         {
             if(locator != null && servant != null)
             {
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index 459b4248a45..f1f27db86c1 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -120,11 +120,11 @@ public class IncomingConnectionFactory extends EventHandler
             connection.activate();
             _connections.add(connection);
         }
-        catch (Ice.TimeoutException ex)
+        catch(Ice.TimeoutException ex)
         {
             // Ignore timeouts.
         }
-        catch (Ice.LocalException ex)
+        catch(Ice.LocalException ex)
         {
             if(_warn)
             {
@@ -159,13 +159,13 @@ public class IncomingConnectionFactory extends EventHandler
                         Connection connection = new Connection(_instance, transceiver, _endpoint, _adapter);
                         connection.destroy(Connection.ObjectAdapterDeactivated);
                     }
-                    catch (Ice.TimeoutException ex)
+                    catch(Ice.TimeoutException ex)
                     {
                         break; // Exit loop on timeout.
                     }
                 }
             }
-            catch (Ice.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 if(_warn)
                 {
@@ -239,7 +239,7 @@ public class IncomingConnectionFactory extends EventHandler
                 _acceptor.listen();
             }
         }
-        catch (RuntimeException ex)
+        catch(RuntimeException ex)
         {
             setState(StateClosed);
             throw ex;
@@ -277,7 +277,7 @@ public class IncomingConnectionFactory extends EventHandler
 	    {
 		wait();
 	    }
-	    catch (InterruptedException ex)
+	    catch(InterruptedException ex)
 	    {
 	    }
 	}
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 3db91129ca6..bedd6e17972 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -192,7 +192,7 @@ public class Instance
 
             _bufferManager = new BufferManager(); // Must be created before the ThreadPool
         }
-        catch (Ice.LocalException ex)
+        catch(Ice.LocalException ex)
         {
             destroy();
             throw ex;
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index 41f30210120..1207c9c3217 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -57,7 +57,7 @@ public final class Network
             socket.setKeepAlive(true);
             return fd;
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -80,7 +80,7 @@ public final class Network
             //socket.setKeepAlive(true);
             return fd;
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -95,7 +95,7 @@ public final class Network
         {
             return java.nio.channels.DatagramChannel.open();
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -110,7 +110,7 @@ public final class Network
         {
             fd.configureBlocking(block);
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -127,7 +127,7 @@ public final class Network
             sock.bind(addr);
             return (java.net.InetSocketAddress)sock.getLocalSocketAddress();
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -144,7 +144,7 @@ public final class Network
             sock.bind(addr);
             return (java.net.InetSocketAddress)sock.getLocalSocketAddress();
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -182,19 +182,19 @@ public final class Network
                         Thread.sleep(delay);
                         timer += delay;
                     }
-                    catch (InterruptedException ex)
+                    catch(InterruptedException ex)
                     {
                     }
                 }
             }
         }
-        catch (java.net.ConnectException ex)
+        catch(java.net.ConnectException ex)
         {
             try
             {
                 fd.close();
             }
-            catch (java.io.IOException e)
+            catch(java.io.IOException e)
             {
                 // ignore
             }
@@ -202,13 +202,13 @@ public final class Network
             se.initCause(ex);
             throw se;
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             try
             {
                 fd.close();
             }
-            catch (java.io.IOException e)
+            catch(java.io.IOException e)
             {
                 // ignore
             }
@@ -225,13 +225,13 @@ public final class Network
         {
             fd.connect(addr);
         }
-        catch (java.net.ConnectException ex)
+        catch(java.net.ConnectException ex)
         {
             try
             {
                 fd.close();
             }
-            catch (java.io.IOException e)
+            catch(java.io.IOException e)
             {
                 // ignore
             }
@@ -239,13 +239,13 @@ public final class Network
             se.initCause(ex);
             throw se;
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             try
             {
                 fd.close();
             }
-            catch (java.io.IOException e)
+            catch(java.io.IOException e)
             {
                 // ignore
             }
@@ -298,11 +298,11 @@ public final class Network
 
                                 break;
                             }
-                            catch (java.io.InterruptedIOException ex)
+                            catch(java.io.InterruptedIOException ex)
                             {
                                 continue;
                             }
-                            catch (java.io.IOException ex)
+                            catch(java.io.IOException ex)
                             {
                                 Ice.SocketException se =
                                     new Ice.SocketException();
@@ -317,24 +317,24 @@ public final class Network
                         {
                             selector.close();
                         }
-                        catch (java.io.IOException ex)
+                        catch(java.io.IOException ex)
                         {
                             // Ignore
                         }
                     }
                 }
             }
-            catch (java.io.InterruptedIOException ex)
+            catch(java.io.InterruptedIOException ex)
             {
                 continue;
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 try
                 {
                     fd.close();
                 }
-                catch (java.io.IOException e)
+                catch(java.io.IOException e)
                 {
                     // Ignore
                 }
@@ -350,7 +350,7 @@ public final class Network
             socket.setTcpNoDelay(true);
             socket.setKeepAlive(true);
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -368,7 +368,7 @@ public final class Network
             java.net.InetAddress addr = java.net.InetAddress.getByName(host);
             return new java.net.InetSocketAddress(addr, port);
         }
-        catch (java.net.UnknownHostException ex)
+        catch(java.net.UnknownHostException ex)
         {
             throw new Ice.DNSException();
         }
@@ -436,13 +436,13 @@ public final class Network
                 doConnect(sink, addr, -1);
                 fds.source = doAccept(fd, -1);
             }
-            catch (Ice.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 try
                 {
                     fds.sink.close();
                 }
-                catch (java.io.IOException e)
+                catch(java.io.IOException e)
                 {
                 }
                 throw ex;
@@ -454,7 +454,7 @@ public final class Network
             {
                 fd.close();
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
             }
         }
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 6e241f56ba6..cd0f67f35e3 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -89,7 +89,7 @@ public final class Outgoing
                                 wait();
                             }
                         }
-                        catch (InterruptedException ex)
+                        catch(InterruptedException ex)
                         {
                         }
                     }
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 2a67400bc74..ec24853f151 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -85,15 +85,15 @@ public class OutgoingConnectionFactory
                 _connections.put(endpoint, connection);
                 break;
             }
-            catch (Ice.SocketException ex)
+            catch(Ice.SocketException ex)
             {
                 exception = ex;
             }
-            catch (Ice.DNSException ex)
+            catch(Ice.DNSException ex)
             {
                 exception = ex;
             }
-            catch (Ice.TimeoutException ex)
+            catch(Ice.TimeoutException ex)
             {
                 exception = ex;
             }
diff --git a/java/src/IceInternal/RecursiveMutex.java b/java/src/IceInternal/RecursiveMutex.java
index a662b384c7b..682d1b00428 100644
--- a/java/src/IceInternal/RecursiveMutex.java
+++ b/java/src/IceInternal/RecursiveMutex.java
@@ -35,7 +35,7 @@ public class RecursiveMutex
             {
                 wait();
             }
-            catch (InterruptedException ex)
+            catch(InterruptedException ex)
             {
             }
         }
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 4f1a8df27e5..bb300cf5ba2 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -298,7 +298,7 @@ public final class Reference
                 newRouterInfo = instance.routerManager().get(newRouter);
                 newRouterInfo.setClientProxy(newClientProxy);
             }
-            catch (Ice.NoEndpointException ex)
+            catch(Ice.NoEndpointException ex)
             {
                 // Ignore non-existing client proxies.
             }
diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java
index 2cdde7c1040..f922a9c4e77 100644
--- a/java/src/IceInternal/RouterInfo.java
+++ b/java/src/IceInternal/RouterInfo.java
@@ -28,7 +28,7 @@ public final class RouterInfo
         {
             rhs = (RouterInfo)obj;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
             return false;
         }
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 700fdcca587..3e84824e50e 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -35,7 +35,7 @@ class TcpAcceptor implements Acceptor
             {
                 fd.close();
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 // Ignore.
             }
@@ -107,7 +107,7 @@ class TcpAcceptor implements Acceptor
             java.net.InetSocketAddress addr = new java.net.InetSocketAddress(host, port);
             _addr = Network.doBind(_fd, addr);
         }
-        catch (RuntimeException ex)
+        catch(RuntimeException ex)
         {
             _fd = null;
             throw ex;
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index 5b2cd4b8105..46d46a91adf 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -79,7 +79,7 @@ final class TcpEndpoint implements Endpoint
                     {
                         _port = Integer.parseInt(argument);
                     }
-                    catch (NumberFormatException ex)
+                    catch(NumberFormatException ex)
                     {
                         throw new Ice.EndpointParseException();
                     }
@@ -98,7 +98,7 @@ final class TcpEndpoint implements Endpoint
                     {
                         _timeout = Integer.parseInt(argument);
                     }
-                    catch (NumberFormatException ex)
+                    catch(NumberFormatException ex)
                     {
                         throw new Ice.EndpointParseException();
                     }
@@ -292,7 +292,7 @@ final class TcpEndpoint implements Endpoint
         {
             tcpAcceptor = (TcpAcceptor)acceptor;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
             return false;
         }
@@ -323,7 +323,7 @@ final class TcpEndpoint implements Endpoint
         {
             p = (TcpEndpoint)obj;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
             return 1;
         }
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java
index 07c2b355909..c9b98d1af4c 100644
--- a/java/src/IceInternal/TcpTransceiver.java
+++ b/java/src/IceInternal/TcpTransceiver.java
@@ -34,21 +34,21 @@ final class TcpTransceiver implements Transceiver
         {
             socket.shutdownInput(); // helps to unblock threads in recv()
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
         }
         try
         {
             socket.shutdownOutput();
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
         }
         try
         {
             fd.close();
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
         }
     }
@@ -67,7 +67,7 @@ final class TcpTransceiver implements Transceiver
         {
             socket.shutdownOutput(); // Shutdown socket for writing
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
         }
     }
@@ -96,11 +96,11 @@ final class TcpTransceiver implements Transceiver
                     _logger.trace(_traceLevels.networkCat, s);
                 }
             }
-            catch (java.io.InterruptedIOException ex)
+            catch(java.io.InterruptedIOException ex)
             {
                 continue;
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 Ice.SocketException se = new Ice.SocketException();
                 se.initCause(ex);
@@ -139,11 +139,11 @@ final class TcpTransceiver implements Transceiver
 
                 break;
             }
-            catch (java.io.InterruptedIOException ex)
+            catch(java.io.InterruptedIOException ex)
             {
                 continue;
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 if(Network.connectionLost(ex))
                 {
@@ -219,7 +219,7 @@ final class TcpTransceiver implements Transceiver
 
                             break;
                         }
-                        catch (java.io.InterruptedIOException ex)
+                        catch(java.io.InterruptedIOException ex)
                         {
                             continue;
                         }
@@ -232,11 +232,11 @@ final class TcpTransceiver implements Transceiver
                     _logger.trace(_traceLevels.networkCat, s);
                 }
             }
-            catch (java.io.InterruptedIOException ex)
+            catch(java.io.InterruptedIOException ex)
             {
                 continue;
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 if(Network.connectionLost(ex))
                 {
@@ -281,7 +281,7 @@ final class TcpTransceiver implements Transceiver
             {
                 _selector.close();
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
             }
         }
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index dc6ccc9a1d6..f15270adb2e 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -46,7 +46,7 @@ public final class ThreadPool
                 {
                     throw new RuntimeException();
                 }
-                catch (RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     java.io.PrintWriter pw = new java.io.PrintWriter(sw);
                     ex.printStackTrace(pw);
@@ -98,7 +98,7 @@ public final class ThreadPool
             {
                 wait();
             }
-            catch (InterruptedException ex)
+            catch(InterruptedException ex)
             {
             }
         }
@@ -137,7 +137,7 @@ public final class ThreadPool
                     _threads[i].join();
                     break;
                 }
-                catch (InterruptedException ex)
+                catch(InterruptedException ex)
                 {
                 }
             }
@@ -166,7 +166,7 @@ public final class ThreadPool
             pair.source.configureBlocking(false);
             _fdIntrReadKey = pair.source.register(_selector, java.nio.channels.SelectionKey.OP_READ);
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SystemException sys = new Ice.SystemException();
             sys.initCause(ex);
@@ -209,7 +209,7 @@ public final class ThreadPool
                 _threads[i].start();
             }
         }
-        catch (RuntimeException ex)
+        catch(RuntimeException ex)
         {
 	    java.io.StringWriter sw = new java.io.StringWriter();
 	    java.io.PrintWriter pw = new java.io.PrintWriter(sw);
@@ -235,7 +235,7 @@ public final class ThreadPool
             {
                 _selector.close();
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
             }
         }
@@ -245,7 +245,7 @@ public final class ThreadPool
             {
                 _fdIntrWrite.close();
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
             }
         }
@@ -255,7 +255,7 @@ public final class ThreadPool
             {
                 _fdIntrRead.close();
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
             }
         }
@@ -291,7 +291,7 @@ public final class ThreadPool
                 {
                     throw new RuntimeException();
                 }
-                catch (RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     ex.printStackTrace();
                 }
@@ -320,7 +320,7 @@ public final class ThreadPool
                 break;
             }
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             Ice.SocketException se = new Ice.SocketException();
             se.initCause(ex);
@@ -342,7 +342,7 @@ public final class ThreadPool
                 {
                     throw new RuntimeException();
                 }
-                catch (RuntimeException ex)
+                catch(RuntimeException ex)
                 {
                     ex.printStackTrace();
                 }
@@ -357,7 +357,7 @@ public final class ThreadPool
             {
                 _fdIntrWrite.write(buf);
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 Ice.SocketException se = new Ice.SocketException();
                 se.initCause(ex);
@@ -535,7 +535,7 @@ public final class ThreadPool
                             {
                                 key = change.fd.register(_selector, op, change.handler);
                             }
-                            catch (java.nio.channels.ClosedChannelException ex)
+                            catch(java.nio.channels.ClosedChannelException ex)
                             {
                                 assert(false);
                             }
@@ -648,11 +648,11 @@ public final class ThreadPool
                                     continue repeatSelect;
                                 }
                             }
-                            catch (Ice.TimeoutException ex) // Expected
+                            catch(Ice.TimeoutException ex) // Expected
                             {
                                 continue repeatSelect;
                             }
-                            catch (Ice.LocalException ex)
+                            catch(Ice.LocalException ex)
                             {
                                 if(TRACE_EXCEPTION)
                                 {
@@ -782,11 +782,11 @@ public final class ThreadPool
 
                 break;
             }
-            catch (java.io.InterruptedIOException ex)
+            catch(java.io.InterruptedIOException ex)
             {
                 continue;
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 //
                 // Pressing Ctrl-C causes select() to raise an
@@ -837,11 +837,11 @@ public final class ThreadPool
 
                 ret = _selector.select(timeoutMillis);
             }
-            catch (java.io.InterruptedIOException ex)
+            catch(java.io.InterruptedIOException ex)
             {
                 continue;
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 //
                 // Pressing Ctrl-C causes select() to raise an
@@ -976,7 +976,7 @@ public final class ThreadPool
             {
 		ThreadPool.this.run(stream);
             }
-            catch (Ice.LocalException ex)
+            catch(Ice.LocalException ex)
             {
                 java.io.StringWriter sw = new java.io.StringWriter();
                 java.io.PrintWriter pw = new java.io.PrintWriter(sw);
@@ -985,7 +985,7 @@ public final class ThreadPool
                 String s = "exception in thread pool:\n" + sw.toString();
                 _instance.logger().error(s);
             }
-            catch (RuntimeException ex)
+            catch(RuntimeException 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 5f6ffd81b72..71e94e582bd 100644
--- a/java/src/IceInternal/TraceUtil.java
+++ b/java/src/IceInternal/TraceUtil.java
@@ -245,7 +245,7 @@ final class TraceUtil
             int size = stream.readInt();
             out.write("\nmessage size = " + size);
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             assert(false);
         }
@@ -278,7 +278,7 @@ final class TraceUtil
                 }
             }
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             assert(false);
         }
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index 8f2dde435d4..6b2862c8bea 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -79,7 +79,7 @@ final class UdpEndpoint implements Endpoint
                     {
                         _port = Integer.parseInt(argument);
                     }
-                    catch (NumberFormatException ex)
+                    catch(NumberFormatException ex)
                     {
                         throw new Ice.EndpointParseException();
                     }
@@ -274,7 +274,7 @@ final class UdpEndpoint implements Endpoint
         {
             udpTransceiver = (UdpTransceiver)transceiver;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
             return false;
         }
@@ -311,7 +311,7 @@ final class UdpEndpoint implements Endpoint
         {
             p = (UdpEndpoint)obj;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
             return 1;
         }
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index cb0a6419a2a..919c8c0f3da 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -34,7 +34,7 @@ final class UdpTransceiver implements Transceiver
         {
             fd.close();
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
         }
     }
@@ -68,11 +68,11 @@ final class UdpTransceiver implements Transceiver
                 assert(ret == buf.limit());
                 break;
             }
-            catch (java.io.InterruptedIOException ex)
+            catch(java.io.InterruptedIOException ex)
             {
                 continue;
             }
-            catch (java.io.IOException ex)
+            catch(java.io.IOException ex)
             {
                 Ice.SocketException se = new Ice.SocketException();
                 se.initCause(ex);
@@ -119,11 +119,11 @@ final class UdpTransceiver implements Transceiver
                         _logger.trace(_traceLevels.networkCat, s);
                     }
                 }
-                catch (java.io.InterruptedIOException ex)
+                catch(java.io.InterruptedIOException ex)
                 {
                     continue;
                 }
-                catch (java.io.IOException ex)
+                catch(java.io.IOException ex)
                 {
                     Ice.SocketException se = new Ice.SocketException();
                     se.initCause(ex);
@@ -137,11 +137,11 @@ final class UdpTransceiver implements Transceiver
                     _fd.receive(buf);
                     ret = buf.position();
                 }
-                catch (java.io.InterruptedIOException ex)
+                catch(java.io.InterruptedIOException ex)
                 {
                     continue;
                 }
-                catch (java.io.IOException ex)
+                catch(java.io.IOException ex)
                 {
                     Ice.SocketException se = new Ice.SocketException();
                     se.initCause(ex);
@@ -206,7 +206,7 @@ final class UdpTransceiver implements Transceiver
                 _logger.trace(_traceLevels.networkCat, s);
             }
         }
-        catch (Ice.LocalException ex)
+        catch(Ice.LocalException ex)
         {
             _fd = null;
             throw ex;
@@ -237,7 +237,7 @@ final class UdpTransceiver implements Transceiver
                 _logger.trace(_traceLevels.networkCat, s);
             }
         }
-        catch (Ice.LocalException ex)
+        catch(Ice.LocalException ex)
         {
             _fd = null;
             throw ex;
diff --git a/java/src/IceInternal/UnknownEndpoint.java b/java/src/IceInternal/UnknownEndpoint.java
index d9df9d3038f..fd1d1b4b0db 100644
--- a/java/src/IceInternal/UnknownEndpoint.java
+++ b/java/src/IceInternal/UnknownEndpoint.java
@@ -190,7 +190,7 @@ final class UnknownEndpoint implements Endpoint
         {
             p = (UnknownEndpoint)obj;
         }
-        catch (ClassCastException ex)
+        catch(ClassCastException ex)
         {
             return 1;
         }
diff --git a/java/src/IceUtil/OutputBase.java b/java/src/IceUtil/OutputBase.java
index 938efc43d7c..6253c5d39dd 100644
--- a/java/src/IceUtil/OutputBase.java
+++ b/java/src/IceUtil/OutputBase.java
@@ -56,7 +56,7 @@ public class OutputBase
             java.io.BufferedWriter bw = new java.io.BufferedWriter(fw);
             _out = new java.io.PrintWriter(bw);
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
         }
     }
diff --git a/java/src/IceXML/StreamI.java b/java/src/IceXML/StreamI.java
index 156150a1723..789956ec69d 100644
--- a/java/src/IceXML/StreamI.java
+++ b/java/src/IceXML/StreamI.java
@@ -67,7 +67,7 @@ public class StreamI implements Ice.Stream
         {
             parser = factory.newDocumentBuilder();
         }
-        catch (javax.xml.parsers.ParserConfigurationException ex)
+        catch(javax.xml.parsers.ParserConfigurationException ex)
         {
             logger.error("parser configuration error: " + ex.getMessage());
             Ice.MarshalException e = new Ice.MarshalException();
@@ -91,12 +91,12 @@ public class StreamI implements Ice.Stream
         {
             _document = parser.parse(new org.xml.sax.InputSource(input));
         }
-        catch (java.io.IOException ex)
+        catch(java.io.IOException ex)
         {
             logger.error("I/O error during parsing: " + ex.getMessage());
             errorsOccurred = true;
         }
-        catch (org.xml.sax.SAXException ex)
+        catch(org.xml.sax.SAXException ex)
         {
             logger.error("parsing error: " + ex.getMessage());
             errorsOccurred = true;
@@ -366,7 +366,7 @@ public class StreamI implements Ice.Stream
         {
             i = Integer.parseInt(s);
         }
-        catch (NumberFormatException ex)
+        catch(NumberFormatException ex)
         {
             Ice.MarshalException e = new Ice.MarshalException();
             e.initCause(ex);
@@ -498,7 +498,7 @@ public class StreamI implements Ice.Stream
         {
             i = Short.parseShort(s);
         }
-        catch (NumberFormatException ex)
+        catch(NumberFormatException ex)
         {
             Ice.MarshalException e = new Ice.MarshalException();
             e.initCause(ex);
@@ -569,7 +569,7 @@ public class StreamI implements Ice.Stream
         {
             i = Integer.parseInt(s);
         }
-        catch (NumberFormatException ex)
+        catch(NumberFormatException ex)
         {
             Ice.MarshalException e = new Ice.MarshalException();
             e.initCause(ex);
@@ -640,7 +640,7 @@ public class StreamI implements Ice.Stream
         {
             i = Long.parseLong(s);
         }
-        catch (NumberFormatException ex)
+        catch(NumberFormatException ex)
         {
             Ice.MarshalException e = new Ice.MarshalException();
             e.initCause(ex);
@@ -711,7 +711,7 @@ public class StreamI implements Ice.Stream
         {
             i = Float.parseFloat(s);
         }
-        catch (NumberFormatException ex)
+        catch(NumberFormatException ex)
         {
             Ice.MarshalException e = new Ice.MarshalException();
             e.initCause(ex);
@@ -782,7 +782,7 @@ public class StreamI implements Ice.Stream
         {
             i = Double.parseDouble(s);
         }
-        catch (NumberFormatException ex)
+        catch(NumberFormatException ex)
         {
             Ice.MarshalException e = new Ice.MarshalException();
             e.initCause(ex);
@@ -1268,7 +1268,7 @@ public class StreamI implements Ice.Stream
                 {
                     return Integer.parseInt(attribute.getNodeValue());
                 }
-                catch (NumberFormatException ex)
+                catch(NumberFormatException ex)
                 {
                     throw new Ice.MarshalException();
                 }