QPID-8283: [JMS AMQP 0-x] Fix setting option 'encryption_trust_store_password'
diff --git a/client/src/main/java/org/apache/qpid/client/BrokerDetails.java b/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
index 609dd59..0ce3fd3 100644
--- a/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
+++ b/client/src/main/java/org/apache/qpid/client/BrokerDetails.java
@@ -559,7 +559,7 @@
if (getProperty(BrokerDetails.OPTIONS_ENCRYPTION_TRUST_STORE_PASSWORD) != null)
{
- conSettings.setEncryptionKeyStorePassword(
+ conSettings.setEncryptionTrustStorePassword(
getProperty(BrokerDetails.OPTIONS_ENCRYPTION_TRUST_STORE_PASSWORD));
}
diff --git a/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java b/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
index fd0e7d0..3d7e63f 100644
--- a/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
+++ b/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
@@ -247,4 +247,28 @@
assertNull(String.format("Unexpected '%s' property value", BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME),
broker.getProperty(BrokerDetails.OPTIONS_SSL_VERIFY_HOSTNAME));
}
+
+ public void testEncryptionKeyStorePath() throws Exception
+ {
+ String brokerURL = "tcp://localhost:5672?ssl='true'&encryption_key_store='path'";
+ BrokerDetails broker = new BrokerDetails(brokerURL);
+ ConnectionSettings connectionSettings = broker.buildConnectionSettings();
+ assertEquals("path", connectionSettings.getEncryptionKeyStorePath());
+ }
+
+ public void testEncryptionKeyStorePassword() throws Exception
+ {
+ String brokerURL = "tcp://localhost:5672?ssl='true'&encryption_key_store_password='pass'&encryption_trust_store_password='foo'";
+ BrokerDetails broker = new BrokerDetails(brokerURL);
+ ConnectionSettings connectionSettings = broker.buildConnectionSettings();
+ assertEquals("pass", connectionSettings.getEncryptionKeyStorePassword());
+ }
+
+ public void testEncryptionTrustStorePassword() throws Exception
+ {
+ String brokerURL = "tcp://localhost:5672?ssl='true'&encryption_key_store_password='pass'&encryption_trust_store_password='foo'";
+ BrokerDetails broker = new BrokerDetails(brokerURL);
+ ConnectionSettings connectionSettings = broker.buildConnectionSettings();
+ assertEquals("foo", connectionSettings.getEncryptionTrustStorePassword());
+ }
}
