You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/03/11 15:37:34 UTC
qpid-jms git commit: Fix c/p error on loading trust store instances.
Repository: qpid-jms
Updated Branches:
refs/heads/master 802edcf3d -> 4ded822f4
Fix c/p error on loading trust store instances.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/4ded822f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/4ded822f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/4ded822f
Branch: refs/heads/master
Commit: 4ded822f49ef57f918db43fc105f476ab6aa64ea
Parents: 802edcf
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Mar 11 10:37:27 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Mar 11 10:37:27 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/transports/TransportSupport.java | 6 +++---
.../qpid/jms/transports/netty/NettySslTransportTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4ded822f/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
index 1413f21..b1ea723 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
@@ -155,11 +155,11 @@ public class TransportSupport {
TrustManagerFactory fact = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- String storeLocation = options.getKeyStoreLocation();
- String storePassword = options.getKeyStorePassword();
+ String storeLocation = options.getTrustStoreLocation();
+ String storePassword = options.getTrustStorePassword();
String storeType = options.getStoreType();
- LOG.trace("Attempt to load KeyStore from location {} of type {}", storeLocation, storeType);
+ LOG.trace("Attempt to load TrustStore from location {} of type {}", storeLocation, storeType);
KeyStore trustStore = loadStore(storeLocation, storePassword, storeType);
fact.init(trustStore);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4ded822f/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
index ed25dfb..f76e496 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
@@ -40,7 +40,7 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
public static final String PASSWORD = "password";
public static final String SERVER_KEYSTORE = "src/test/resources/example-jks.keystore";
- public static final String CLIENT_TRUSTSTORE = "src/test/resources/exanple-jks.truststore";
+ public static final String CLIENT_TRUSTSTORE = "src/test/resources/example-jks.truststore";
public static final String KEYSTORE_TYPE = "jks";
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org