diff options
| -rw-r--r-- | java/test/IceSSL/configuration/Client.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java index 6177553f004..cbeef9c1016 100644 --- a/java/test/IceSSL/configuration/Client.java +++ b/java/test/IceSSL/configuration/Client.java @@ -21,20 +21,19 @@ public class Client Test.ServerFactoryPrx factory; // - // If we're using JDK 1.4, we can only use thread-per-connection. - // Otherwise, we run the test twice, once for each concurrency model. + // If we're using JDK 1.4, or JDK 1.5 with the 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); + + boolean threadPerConnection = communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") > 0; String jdkVersion = System.getProperty("java.version"); - if(jdkVersion.startsWith("1.4")) - { - factory = AllTests.allTests(communicator, args[0], false); - } - else + if(jdkVersion.startsWith("1.5") && !threadPerConnection) { - System.out.println("testing with thread-per-connection."); - AllTests.allTests(communicator, args[0], false); System.out.println("testing with thread pool."); - factory = AllTests.allTests(communicator, args[0], true); + AllTests.allTests(communicator, args[0], true); } factory.shutdown(); |