Repository: commons-dbcp Updated Branches: refs/heads/master 04e3fe1d2 -> 3fe15786c
[DBCP-519] Add some toString() methods for debugging (never printing passwords): Synchronize toString() for mutable objects. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/3fe15786 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/3fe15786 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/3fe15786 Branch: refs/heads/master Commit: 3fe15786c11fdcf1808aacc05b8b15d61f7ce23e Parents: 04e3fe1 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Thu Aug 16 15:41:42 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Thu Aug 16 15:41:42 2018 -0600 ---------------------------------------------------------------------- src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 2 +- .../org/apache/commons/dbcp2/DelegatingPreparedStatement.java | 2 +- src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java | 4 ++-- src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java | 2 +- src/main/java/org/apache/commons/dbcp2/PoolingConnection.java | 2 +- .../org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +- .../apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +- .../apache/commons/dbcp2/datasources/CPDSConnectionFactory.java | 2 +- .../apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index a94b665..546e6a8 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -88,7 +88,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i * Returns a string representation of the metadata associated with the innermost delegate connection. */ @Override - public String toString() { + public synchronized String toString() { String s = null; final Connection c = this.getInnermostDelegateInternal(); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java index 5d38e03..048687c 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java @@ -688,7 +688,7 @@ public class DelegatingPreparedStatement extends DelegatingStatement implements */ @SuppressWarnings("resource") @Override - public String toString() { + public synchronized String toString() { final Statement statement = getDelegate(); return statement == null ? "NULL" : statement.toString(); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java index cac9133..3d1483c 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -1242,8 +1242,8 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS } @Override - public String toString() { - return super.toString() + "[_res=" + resultSet + ", _stmt=" + statement + ", _conn=" + connection + "]"; + public synchronized String toString() { + return super.toString() + "[resultSet=" + resultSet + ", statement=" + statement + ", connection=" + connection + "]"; } @Override http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java index 3df926b..8a1725f 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java @@ -790,7 +790,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { * @return String */ @Override - public String toString() { + public synchronized String toString() { return statement == null ? "NULL" : statement.toString(); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java index d4df45f..d99ed22 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java @@ -579,7 +579,7 @@ public class PoolingConnection extends DelegatingConnection<Connection> } @Override - public String toString() { + public synchronized String toString() { if (pstmtPool != null) { return "PoolingConnection: " + pstmtPool.toString(); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index add181e..0171264 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -740,7 +740,7 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl * @since 2.6.0 */ @Override - public String toString() { + public synchronized String toString() { StringBuilder builder = new StringBuilder(super.toString()); builder.append("[description="); builder.append(description); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java index 604ad71..68ac396 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java @@ -649,7 +649,7 @@ class PooledConnectionImpl } @Override - public String toString() { + public synchronized String toString() { StringBuilder builder = new StringBuilder(super.toString()); builder.append("[connection="); builder.append(connection); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java index a6253f0..df8f96a 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java @@ -399,7 +399,7 @@ class CPDSConnectionFactory } @Override - public String toString() { + public synchronized String toString() { StringBuilder builder = new StringBuilder(super.toString()); builder.append("[cpds="); builder.append(cpds); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3fe15786/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java index 2145995..fb8636b 100644 --- a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java @@ -1055,7 +1055,7 @@ public abstract class InstanceKeyDataSource implements DataSource, Referenceable } @Override - public String toString() { + public synchronized String toString() { StringBuilder builder = new StringBuilder(super.toString()); builder.append("["); toStringFields(builder);