You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2012/01/17 23:15:22 UTC
svn commit: r1232611 - in
/qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra:
ConnectionFactoryProperties.java QpidResourceAdapter.java Util.java
Author: rajith
Date: Tue Jan 17 22:15:21 2012
New Revision: 1232611
URL: http://svn.apache.org/viewvc?rev=1232611&view=rev
Log:
QPID-3764 Committing a patch by Weston Price.
Modified:
qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java
Modified: qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java?rev=1232611&r1=1232610&r2=1232611&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java (original)
+++ qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java Tue Jan 17 22:15:21 2012
@@ -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;
}
Modified: qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java?rev=1232611&r1=1232610&r2=1232611&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java (original)
+++ qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java Tue Jan 17 22:15:21 2012
@@ -425,11 +425,6 @@ public class QpidResourceAdapter impleme
*/
public void setConnectionURL(final String connectionURL)
{
- if (_log.isTraceEnabled())
- {
- _log.trace("setConnectionURL(" + connectionURL + ")");
- }
-
_raProperties.setConnectionURL(connectionURL);
}
Modified: qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java?rev=1232611&r1=1232610&r2=1232611&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java (original)
+++ qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java Tue Jan 17 22:15:21 2012
@@ -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;
+ }
+
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org