You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ac...@apache.org on 2016/08/04 11:58:30 UTC
karaf git commit: [KARAF-4646] LdapPoolingTest fails with IBM JDK
Repository: karaf
Updated Branches:
refs/heads/master c652b9e65 -> f136aec09
[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/f136aec0
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f136aec0
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f136aec0
Branch: refs/heads/master
Commit: f136aec09eb1e6f354036405600d1e3acc90c533
Parents: c652b9e
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Aug 4 13:38:17 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Aug 4 13:57:27 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/f136aec0/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());
}