diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-05-15 19:25:33 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-05-15 19:25:33 +0000 |
| commit | 6d5b9881d73d1a5fbf99090fbd2f9aafb9b71165 (patch) | |
| tree | 2843fd9501faa3ebfc6999ef7230562592a3ede8 /java/test/IceSSL/configuration/Client.java | |
| parent | thread pool changes to support Java5 SSL plugin (diff) | |
| download | ice-6d5b9881d73d1a5fbf99090fbd2f9aafb9b71165.tar.bz2 ice-6d5b9881d73d1a5fbf99090fbd2f9aafb9b71165.tar.xz ice-6d5b9881d73d1a5fbf99090fbd2f9aafb9b71165.zip | |
adding SSL plugin for Java5
Diffstat (limited to 'java/test/IceSSL/configuration/Client.java')
| -rw-r--r-- | java/test/IceSSL/configuration/Client.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java index 3f2f8eca703..6177553f004 100644 --- a/java/test/IceSSL/configuration/Client.java +++ b/java/test/IceSSL/configuration/Client.java @@ -18,7 +18,26 @@ public class Client return 1; } - AllTests.allTests(communicator, args[0]); + 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. + // + String jdkVersion = System.getProperty("java.version"); + if(jdkVersion.startsWith("1.4")) + { + factory = AllTests.allTests(communicator, args[0], false); + } + else + { + 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); + } + + factory.shutdown(); return 0; } |