- Merge IPv6 support from Dwayne's branch.

- Reviewed and fixed IPv6 bugs.
- Fixed bug in the outgoing connection factory where an assert could be
  triggered if the proxy contained identical endpoints

1 files changed, 1 insertions, 12 deletions

diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java
index 6479e180286..a330f31e53c 100644
--- a/java/test/IceSSL/configuration/Client.java
+++ b/java/test/IceSSL/configuration/Client.java
@@ -20,18 +20,7 @@ public class Client
 
         Test.ServerFactoryPrx factory;
 
-        //
-        // If we're using the JDK 1.4 plugin, we can only use thread-per-connection.
-        // Otherwise, we run the test twice, once for each concurrency model.
-        //
-        System.out.println("testing with thread-per-connection.");
-        factory = AllTests.allTests(communicator, args[0], false);
-
-        if(!IceSSL.Util.jdkTarget.equals("1.4"))
-        {
-            System.out.println("testing with thread pool.");
-            AllTests.allTests(communicator, args[0], true);
-        }
+        factory = AllTests.allTests(communicator, args[0]);
 
         factory.shutdown();