QPID-3764 Committing a patch by Weston Price.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1232611 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 19 insertions, 6 deletions

diff --git a/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java b/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
index be129a67cc..a7b36bc98c 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
+++ b/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
@@ -87,8 +87,9 @@ public class ConnectionFactoryProperties
    {
       if (_log.isTraceEnabled())
       {
-         _log.trace("setConnectionURL(" + connectionURL + ")");
+         _log.trace("setConnectionURL(" + Util.maskUrlForLog(connectionURL) + ")");
       }
+
       _hasBeenUpdated = true;
       this._connectionURL = connectionURL;
    }
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java b/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
index d56f520db4..363af1bbcd 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
+++ b/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
@@ -425,11 +425,6 @@ public class QpidResourceAdapter implements ResourceAdapter, Serializable
     */
    public void setConnectionURL(final String connectionURL)
    {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("setConnectionURL(" + connectionURL + ")");
-      }
-
       _raProperties.setConnectionURL(connectionURL);
    }
 
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/Util.java b/java/jca/src/main/java/org/apache/qpid/ra/Util.java
index b927aaa0be..3957fa9660 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/Util.java
+++ b/java/jca/src/main/java/org/apache/qpid/ra/Util.java
@@ -34,8 +34,10 @@ import javax.naming.Reference;
 import javax.naming.Referenceable;
 import javax.transaction.TransactionManager;
 
+import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.ra.admin.QpidQueue;
 import org.apache.qpid.ra.admin.QpidTopic;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -181,4 +183,19 @@ public class Util
    {
       return (object == null ? "null" : object.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(object))) ;
    }
+
+
+   public static String maskUrlForLog(final String url)
+   {
+       String results = null;
+
+       try
+       {
+           results = new AMQConnectionURL(url).toString();
+       }
+       catch(Exception ignore){}
+
+       return (results == null) ? url : results;
+   }
+
 }