[commons-dbcp] branch master updated: Wrong property name logged in ConnectionFactoryFactory.createConnectionFactory().

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git


The following commit(s) were added to refs/heads/master by this push:
     new 9b967afc Wrong property name logged in 
ConnectionFactoryFactory.createConnectionFactory().
9b967afc is described below

commit 9b967afc73caf3047c7b23fc30cbea7223f82fd0
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Tue Aug 30 09:14:20 2022 -0400

    Wrong property name logged in
    ConnectionFactoryFactory.createConnectionFactory().
---
 src/changes/changes.xml                                              | 3 +++
 src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7f44d03f..d1b0c998 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -110,6 +110,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix" due-to="SpotBugs, Gary Gregory">
         SpotBugs: An overridable method is called from constructors in 
PoolablePreparedStatement.
       </action>
+      <action dev="ggregory" type="fix" due-to="Gary Gregory">
+        Wrong property name logged in 
ConnectionFactoryFactory.createConnectionFactory(BasicDataSource, Driver).
+      </action>
       <!-- ADD -->
       <action dev="ggregory" type="add" due-to="Gary Gregory">
         Add and use AbandonedTrace#setLastUsed(Instant).
diff --git 
a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java 
b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
index 2e87efb0..ba17862b 100644
--- a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
@@ -46,14 +46,14 @@ final class ConnectionFactoryFactory {
         if (user != null) {
             connectionProperties.put(Constants.KEY_USER, user);
         } else {
-            basicDataSource.log("DBCP DataSource configured without a 
'username'");
+            basicDataSource.log(String.format("DBCP DataSource configured 
without a '%s'", Constants.KEY_USER));
         }
 
         final String pwd = basicDataSource.getPassword();
         if (pwd != null) {
             connectionProperties.put(Constants.KEY_PASSWORD, pwd);
         } else {
-            basicDataSource.log("DBCP DataSource configured without a 
'password'");
+            basicDataSource.log(String.format("DBCP DataSource configured 
without a '%s'", Constants.KEY_PASSWORD));
         }
         final String connectionFactoryClassName = 
basicDataSource.getConnectionFactoryClassName();
         if (connectionFactoryClassName != null) {