exception handling fixes

5 files changed, 23 insertions, 15 deletions

diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index abd2bd448f4..5f858cd160c 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -65,7 +65,7 @@ public class AllTests
                     obj.abort();
                     test(false);
                 }
-                catch(Ice.SocketException ex)
+                catch(Ice.ConnectionLostException ex)
                 {
                     System.out.println("ok");
                 }
@@ -79,7 +79,7 @@ public class AllTests
                     obj.idempotentAbort();
                     test(false);
                 }
-                catch(Ice.SocketException ex)
+                catch(Ice.ConnectionLostException ex)
                 {
                     System.out.println("ok");
                 }
@@ -94,7 +94,7 @@ public class AllTests
                     obj.nonmutatingAbort();
                     test(false);
                 }
-                catch(Ice.SocketException ex)
+                catch(Ice.ConnectionLostException ex)
                 {
                     System.out.println("ok");
                 }
@@ -113,7 +113,11 @@ public class AllTests
             obj.ice_ping();
             test(false);
         }
-        catch(Ice.SocketException ex)
+        catch(Ice.CloseConnectionException ex)
+        {
+            System.out.println("ok");
+        }
+        catch(Ice.ConnectFailedException ex)
         {
             System.out.println("ok");
         }
diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py
index e895d6957bc..e0f074100d7 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/Ice/faultTolerance/run.py
@@ -27,7 +27,7 @@ classpath = os.path.join(toplevel, "lib") + TestUtil.sep + os.path.join(testdir,
 server = "java -classpath \"" + classpath + "\" Server"
 client = "java -classpath \"" + classpath + "\" Client"
 
-num = 10
+num = 6
 base = 12340
 
 updatedServerOptions = TestUtil.serverOptions.replace("TOPLEVELDIR", toplevel)
diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java
index 3b93725cb96..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.SocketException ex)
+	catch(Ice.LocalException ex)
 	{
 	    test(false);
 	}
@@ -109,10 +109,14 @@ public class AllTests
 	    obj2.ice_ping();
 	    test(false);
 	}
-	catch(Ice.SocketException ex)
-	{
-	    System.out.println("ok");
-	}
+        catch(Ice.CloseConnectionException ex)
+        {
+            System.out.println("ok");
+        }
+        catch(Ice.ConnectFailedException ex)
+        {
+            System.out.println("ok");
+        }
 
 	System.out.print("shutdown server manager...");
         System.out.flush();
diff --git a/java/test/Ice/locationForward/AllTests.java b/java/test/Ice/locationForward/AllTests.java
index 4829c3ea0d3..420931987c6 100644
--- a/java/test/Ice/locationForward/AllTests.java
+++ b/java/test/Ice/locationForward/AllTests.java
@@ -54,7 +54,11 @@ public class AllTests
             lastObj.ice_ping();
             test(false);
         }
-        catch(Ice.SocketException ex)
+        catch(Ice.CloseConnectionException ex)
+        {
+            System.out.println("ok");
+        }
+        catch(Ice.ConnectFailedException ex)
         {
             System.out.println("ok");
         }
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index e95491eccec..bb4068c4c09 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -31,10 +31,6 @@ public class Client
         {
             System.out.println("ok");
         }
-        catch(Ice.ConnectionLostException ex)
-        {
-            System.out.println("ok");
-        }
 
         return 0;
     }