Repository: karaf Updated Branches: refs/heads/karaf-3.0.x f72a527c4 -> 5a32d3627
[KARAF-4646] LdapPoolingTest fails with IBM JDK Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5a32d362 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5a32d362 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5a32d362 Branch: refs/heads/karaf-3.0.x Commit: 5a32d3627ceceb7ed70870ed62e8288e510c00b8 Parents: f72a527 Author: Andrea Cosentino <[email protected]> Authored: Thu Aug 4 13:38:17 2016 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Thu Aug 4 14:01:17 2016 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5a32d362/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java index a66ec4f..708b82a 100644 --- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java +++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapPoolingTest.java @@ -61,7 +61,12 @@ public class LdapPoolingTest extends AbstractLdapTestUnit { kmf.init(ks, "123456".toCharArray()); tmf.init(ks); - sslContext = SSLContext.getInstance("TLSv1.2"); + String javaVendor = System.getProperty("java.vendor"); + if (javaVendor.contains("IBM")) { + sslContext = SSLContext.getInstance("SSL_TLSv2","IBMJSSE2"); + } else { + sslContext = SSLContext.getInstance("TLSv1.2"); + } sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), new SecureRandom()); }
