1 files changed, 8 insertions, 1 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
index 89273599b9..597096db57 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
@@ -344,7 +344,14 @@ public class AMQBrokerDetails implements BrokerDetails
 
                 optionsURL.append("='");
 
-                optionsURL.append(_options.get(key));
+                if (OPTIONS_TRUST_STORE_PASSWORD.equals(key) || OPTIONS_KEY_STORE_PASSWORD.equals(key))
+                {
+                    optionsURL.append("********");
+                }
+                else
+                {
+                    optionsURL.append(_options.get(key));
+                }
 
                 optionsURL.append("'");