summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-07-19 11:08:30 -0400
committerJoe George <joe@zeroc.com>2016-07-19 15:50:28 -0400
commit1b9ad1d49c3381c1dc30839016fb3b20fde98ac8 (patch)
treee89344ddbaabbedf0b22d400b9d2cfc98427e931 /java
parentICE-7241 - Python Ice/optional cross test failure (diff)
downloadice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.tar.bz2
ice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.tar.xz
ice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.zip
ICE-7240 - Python Ice/servantLocator cross test
Diffstat (limited to 'java')
-rw-r--r--java/test/src/main/java/test/Ice/servantLocator/AllTests.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/test/src/main/java/test/Ice/servantLocator/AllTests.java b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
index 8fd6804a976..37faaa29f8b 100644
--- a/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
@@ -106,7 +106,8 @@ public class AllTests
}
catch(UnknownLocalException ex)
{
- test(ex.unknown.indexOf("Ice::SocketException") >= 0);
+ test(ex.unknown.indexOf("Ice::SocketException") >= 0 ||
+ ex.unknown.indexOf("Ice.SocketException") >= 0);
}
catch(Throwable ex)
{