diff options
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/Ice/binding/AllTests.java | 36 | ||||
| -rw-r--r-- | java/test/Ice/proxy/AllTests.java | 4 |
2 files changed, 32 insertions, 8 deletions
diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java index 242c25093f4..753837e762a 100644 --- a/java/test/Ice/binding/AllTests.java +++ b/java/test/Ice/binding/AllTests.java @@ -123,8 +123,12 @@ public class AllTests test3.ice_ping(); test(false); } - catch(Ice.ConnectionRefusedException ex) + catch(Ice.ConnectFailedException ex) { + // + // Usually the actual type of this exception is ConnectionRefusedException, + // but not always. See bug 3179. + // } } System.out.println("ok"); @@ -390,8 +394,12 @@ public class AllTests { test.getAdapterName(); } - catch(Ice.ConnectionRefusedException ex) + catch(Ice.ConnectFailedException ex) { + // + // Usually the actual type of this exception is ConnectionRefusedException, + // but not always. See bug 3179. + // } Ice.Endpoint[] endpoints = test.ice_getEndpoints(); @@ -439,8 +447,12 @@ public class AllTests test(test3.ice_getConnection() == test1.ice_getConnection()); test(false); } - catch(Ice.ConnectionRefusedException ex) + catch(Ice.ConnectFailedException ex) { + // + // Usually the actual type of this exception is ConnectionRefusedException, + // but not always. See bug 3179. + // } } System.out.println("ok"); @@ -553,8 +565,12 @@ public class AllTests { test.getAdapterName(); } - catch(Ice.ConnectionRefusedException ex) + catch(Ice.ConnectFailedException ex) { + // + // Usually the actual type of this exception is ConnectionRefusedException, + // but not always. See bug 3179. + // } Ice.Endpoint[] endpoints = test.ice_getEndpoints(); @@ -613,8 +629,12 @@ public class AllTests { test.getAdapterName(); } - catch(Ice.ConnectionRefusedException ex) + catch(Ice.ConnectFailedException ex) { + // + // Usually the actual type of this exception is ConnectionRefusedException, + // but not always. See bug 3179. + // } Ice.Endpoint[] endpoints = test.ice_getEndpoints(); @@ -708,8 +728,12 @@ public class AllTests testSecure.ice_ping(); test(false); } - catch(Ice.ConnectionRefusedException ex) + catch(Ice.ConnectFailedException ex) { + // + // Usually the actual type of this exception is ConnectionRefusedException, + // but not always. See bug 3179. + // } deactivate(com, adapters); diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/Ice/proxy/AllTests.java index 2f261bf794a..50862f47e1c 100644 --- a/java/test/Ice/proxy/AllTests.java +++ b/java/test/Ice/proxy/AllTests.java @@ -597,7 +597,7 @@ public class AllTests // // Try to invoke on the SSL endpoint to verify that we get a - // NoEndpointException (or ConnectionRefusedException when + // NoEndpointException (or ConnectFailedException when // running with SSL). // try @@ -609,7 +609,7 @@ public class AllTests { test(!ssl); } - catch(Ice.ConnectionRefusedException ex) + catch(Ice.ConnectFailedException ex) { test(ssl); } |