Repository: commons-dbcp Updated Branches: refs/heads/master 5bac43f7b -> 16c46bdb4
[DBCP-519] Add some toString() methods for debugging (never printing passwords) Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/16c46bdb Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/16c46bdb Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/16c46bdb Branch: refs/heads/master Commit: 16c46bdb4330287fa64cbb2b71014c76852e5c8b Parents: 5bac43f Author: Gary Gregory <garydgreg...@gmail.com> Authored: Thu Aug 16 13:09:46 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Thu Aug 16 13:09:46 2018 -0600 ---------------------------------------------------------------------- .../apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/16c46bdb/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 db97efe..eb0d472 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -764,7 +764,13 @@ public class DriverAdapterCPDS implements ConnectionPoolDataSource, Referenceabl builder.append(", getConnectionCalled="); builder.append(getConnectionCalled); builder.append(", connectionProperties="); - builder.append(((Properties) connectionProperties.clone()).remove("password")); + Properties tmpProps = connectionProperties; + final String pwdKey = "password"; + if (connectionProperties.contains(pwdKey)) { + tmpProps = (Properties) connectionProperties.clone(); + tmpProps.remove(pwdKey); + } + builder.append(tmpProps); builder.append(", accessToUnderlyingConnectionAllowed="); builder.append(accessToUnderlyingConnectionAllowed); builder.append("]");
