summaryrefslogtreecommitdiff
path: root/qpid/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
commitc5363aef775a5ee38fc667df87ac32c642ef6bac (patch)
tree3bc82dbebf77d72857f6d401e20255cdadaccf37 /qpid/java/client
parent70ddd5482ce29b858598cd0e7972212d77558058 (diff)
downloadqpid-python-c5363aef775a5ee38fc667df87ac32c642ef6bac.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@1340191 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
index 08ee7c3705..aa5981b81f 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
+++ b/qpid/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());
}