summaryrefslogtreecommitdiff
path: root/java/client
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2012-05-18 17:54:23 +0000
committerRobert Godfrey <rgodfrey@apache.org>2012-05-18 17:54:23 +0000
commit9a37608d6345fb2bb4c3574ee06e3a4e2ffb435a (patch)
treee4dfab4c13913e7c923275bdc20be19c62a38d5d /java/client
parentacf096882198c45238de75ba7c9a2e13f1210e85 (diff)
downloadqpid-python-9a37608d6345fb2bb4c3574ee06e3a4e2ffb435a.tar.gz
QPID-3973 : [Java] Add support for non JKS key store types (patch supplied by jsightle@redhat.com)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1340191 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
index 08ee7c3705..aa5981b81f 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
@@ -110,9 +110,11 @@ public class AMQConnectionDelegate_8_0 implements AMQConnectionDelegate
sslContext = SSLContextFactory.buildClientContext(
settings.getTrustStorePath(),
settings.getTrustStorePassword(),
+ settings.getTrustStoreType(),
settings.getTrustManagerFactoryAlgorithm(),
settings.getKeyStorePath(),
settings.getKeyStorePassword(),
+ settings.getKeyStoreType(),
settings.getKeyManagerFactoryAlgorithm(),
settings.getCertAlias());
}