Repository: karaf Updated Branches: refs/heads/karaf-4.0.x 9f513b950 -> b4398afa1
[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/b4398afa Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b4398afa Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b4398afa Branch: refs/heads/karaf-4.0.x Commit: b4398afa13e3919a069ff9e0cae1359c3e946810 Parents: 9f513b9 Author: Andrea Cosentino <[email protected]> Authored: Thu Aug 4 13:38:17 2016 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Thu Aug 4 14:00:05 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/b4398afa/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 cdedc75..e968e81 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()); }
