(tomcat) 03/03: Align with Commons DBCP 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cf27ef1a3dacb08b251bf145ae88ac6a973edb84
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:59:25 2024 +0100
Align with Commons DBCP 2.12.0
Based on review of diff
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 3 ++-
.../tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 10 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 20b3c0c6ed..6506b3fcbe 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -766,8 +766,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the underlying connection pool.
*
* @return the underlying connection pool.
+ * @since DBCP 2.10.0
*/
-protected GenericObjectPool getConnectionPool() {
+public GenericObjectPool getConnectionPool() {
return connectionPool;
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index ae2dc3be23..3007a6cdcb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -573,11 +573,13 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
assertInitializationAllowed();
connectionProperties = props;
if (connectionProperties != null) {
-if (connectionProperties.containsKey(Constants.KEY_USER)) {
-setUser(connectionProperties.getProperty(Constants.KEY_USER));
+final String user =
connectionProperties.getProperty(Constants.KEY_USER);
+if (user != null) {
+setUser(user);
}
-if (connectionProperties.containsKey(Constants.KEY_PASSWORD)) {
-
setPassword(connectionProperties.getProperty(Constants.KEY_PASSWORD));
+final String password =
connectionProperties.getProperty(Constants.KEY_PASSWORD);
+if (password != null) {
+setPassword(password);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Align with Commons DBCP 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 27a703266f17b9fc4c9f68bdcd0f190f7dd0ba60
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:59:25 2024 +0100
Align with Commons DBCP 2.12.0
Based on review of diff
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 3 ++-
.../tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 10 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 20b3c0c6ed..6506b3fcbe 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -766,8 +766,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the underlying connection pool.
*
* @return the underlying connection pool.
+ * @since DBCP 2.10.0
*/
-protected GenericObjectPool getConnectionPool() {
+public GenericObjectPool getConnectionPool() {
return connectionPool;
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index ae2dc3be23..3007a6cdcb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -573,11 +573,13 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
assertInitializationAllowed();
connectionProperties = props;
if (connectionProperties != null) {
-if (connectionProperties.containsKey(Constants.KEY_USER)) {
-setUser(connectionProperties.getProperty(Constants.KEY_USER));
+final String user =
connectionProperties.getProperty(Constants.KEY_USER);
+if (user != null) {
+setUser(user);
}
-if (connectionProperties.containsKey(Constants.KEY_PASSWORD)) {
-
setPassword(connectionProperties.getProperty(Constants.KEY_PASSWORD));
+final String password =
connectionProperties.getProperty(Constants.KEY_PASSWORD);
+if (password != null) {
+setPassword(password);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Align with Commons DBCP 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 287f97c53a36416d3f2964e160c8b65b6e61e8da
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:59:25 2024 +0100
Align with Commons DBCP 2.12.0
Based on review of diff
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 3 ++-
.../tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 10 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 0e4aaa06bd..790141e622 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -727,8 +727,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the underlying connection pool.
*
* @return the underlying connection pool.
+ * @since DBCP 2.10.0
*/
-protected GenericObjectPool getConnectionPool() {
+public GenericObjectPool getConnectionPool() {
return connectionPool;
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index ae2dc3be23..3007a6cdcb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -573,11 +573,13 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
assertInitializationAllowed();
connectionProperties = props;
if (connectionProperties != null) {
-if (connectionProperties.containsKey(Constants.KEY_USER)) {
-setUser(connectionProperties.getProperty(Constants.KEY_USER));
+final String user =
connectionProperties.getProperty(Constants.KEY_USER);
+if (user != null) {
+setUser(user);
}
-if (connectionProperties.containsKey(Constants.KEY_PASSWORD)) {
-
setPassword(connectionProperties.getProperty(Constants.KEY_PASSWORD));
+final String password =
connectionProperties.getProperty(Constants.KEY_PASSWORD);
+if (password != null) {
+setPassword(password);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
