diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-11-06 23:43:50 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-11-06 23:43:50 +0000 |
| commit | 6a9ce19f01b60db3bdc48784dcc3afe3120a1f2c (patch) | |
| tree | dbfcf802f352df5c5fd009d9c6c9519128f550d1 /java/test/IceSSL/configuration/Client.java | |
| parent | Added Ordered load-balancing policy and policy field on adapters (diff) | |
| download | ice-6a9ce19f01b60db3bdc48784dcc3afe3120a1f2c.tar.bz2 ice-6a9ce19f01b60db3bdc48784dcc3afe3120a1f2c.tar.xz ice-6a9ce19f01b60db3bdc48784dcc3afe3120a1f2c.zip | |
bug 1444: allow test to detect target JDK version
Diffstat (limited to 'java/test/IceSSL/configuration/Client.java')
| -rw-r--r-- | java/test/IceSSL/configuration/Client.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java index cbeef9c1016..41ade44fde1 100644 --- a/java/test/IceSSL/configuration/Client.java +++ b/java/test/IceSSL/configuration/Client.java @@ -21,16 +21,13 @@ public class Client Test.ServerFactoryPrx factory; // - // 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. + // 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); - boolean threadPerConnection = communicator.getProperties().getPropertyAsInt("Ice.ThreadPerConnection") > 0; - String jdkVersion = System.getProperty("java.version"); - if(jdkVersion.startsWith("1.5") && !threadPerConnection) + if(!IceSSL.Util.jdkTarget.equals("1.4")) { System.out.println("testing with thread pool."); AllTests.allTests(communicator, args[0], true); |