porting stable_30

1 files changed, 1 insertions, 17 deletions

diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java
index 78124f2fe77..d9ee83cc79a 100644
--- a/java/test/Ice/inheritance/AllTests.java
+++ b/java/test/Ice/inheritance/AllTests.java
@@ -22,25 +22,9 @@ public class AllTests
     public static InitialPrx
     allTests(Ice.Communicator communicator)
     {
-        Ice.Properties properties = communicator.getProperties();
-
-        String protocol = properties.getProperty("Ice.Protocol");
-        String secure = "";
-
-        if (protocol == null)
-        {
-            protocol = "tcp";
-        }
-
-        if (protocol.equals("ssl"))
-        {
-            secure = " -s ";
-        }
-
-        String ref = "initial" + secure + ":" + protocol + " -p 12345 -t 2000";
-
         System.out.print("testing stringToProxy... ");
         System.out.flush();
+        String ref = "initial:default -p 12345 -t 2000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         test(base != null);
         System.out.println("ok");