summaryrefslogtreecommitdiff
path: root/java-compat
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-12-07 16:49:55 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-12-07 16:49:55 +0100
commit51dabfaf7f36ffb929812fefa90140ae8cccea87 (patch)
treebc86a4ad69fb2effbfe7ab515b82fd0027d49f5d /java-compat
parentFixed bug where options weren't propagated to all mappings (diff)
downloadice-51dabfaf7f36ffb929812fefa90140ae8cccea87.tar.bz2
ice-51dabfaf7f36ffb929812fefa90140ae8cccea87.tar.xz
ice-51dabfaf7f36ffb929812fefa90140ae8cccea87.zip
Fixed Java IceSSL/configuration test failure when ran with --protocol=ssl
Diffstat (limited to 'java-compat')
-rw-r--r--java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java2
-rw-r--r--java-compat/test/src/main/java/test/IceSSL/configuration/Server.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java
index 66b78395236..6e836a3f832 100644
--- a/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java
+++ b/java-compat/test/src/main/java/test/IceSSL/configuration/AllTests.java
@@ -121,7 +121,7 @@ public class AllTests
Ice.Communicator communicator = app.communicator();
PrintWriter out = app.getWriter();
- final String factoryRef = "factory:" + app.getTestEndpoint(0);
+ final String factoryRef = "factory:" + app.getTestEndpoint(0, "tcp");
Ice.ObjectPrx b = communicator.stringToProxy(factoryRef);
test(b != null);
ServerFactoryPrx factory = ServerFactoryPrxHelper.checkedCast(b);
diff --git a/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java b/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java
index 5b579becce6..e6238ce8743 100644
--- a/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java
+++ b/java-compat/test/src/main/java/test/IceSSL/configuration/Server.java
@@ -16,7 +16,7 @@ public class Server extends test.Util.Application
public int run(String[] args)
{
Ice.Communicator communicator = communicator();
- communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+ communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp"));
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Identity id = Ice.Util.stringToIdentity("factory");
adapter.add(new ServerFactoryI(), id);