You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/04/20 19:06:14 UTC
commons-dbcp git commit: [DBCP-488] NPE for
org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS.setConnectionProperties(null).
Repository: commons-dbcp
Updated Branches:
refs/heads/master 522646274 -> 71841bce6
[DBCP-488] NPE for
org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS.setConnectionProperties(null).
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/71841bce
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/71841bce
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/71841bce
Branch: refs/heads/master
Commit: 71841bce6f67b8e58b26caaa49b5c0b1f7269534
Parents: 5226462
Author: Gary Gregory <gg...@apache.org>
Authored: Fri Apr 20 13:06:11 2018 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Fri Apr 20 13:06:11 2018 -0600
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
.../commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 12 +++++++-----
.../dbcp2/cpdsadapter/TestDriverAdapterCPDS.java | 7 ++++++-
3 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/71841bce/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a2db9db..67db1d5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -73,6 +73,9 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="update" issue="DBCP-487" due-to="Gary Gregory">
Add API org.apache.commons.dbcp2.datasources.PerUserPoolDataSource.clear().
</action>
+ <action dev="ggregory" type="update" issue="DBCP-488" due-to="Gary Gregory">
+ NPE for org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS.setConnectionProperties(null).
+ </action>
</release>
<release version="2.2.0" date="2017-12-DD" description="This is a minor release, including bug fixes and enhancements.">
<action dev="ggregory" type="fix" issue="DBCP-481" due-to="Gary Gregory">
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/71841bce/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 e926ed0..f42c1db 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -395,11 +395,13 @@ public class DriverAdapterCPDS
public void setConnectionProperties(final Properties props) {
assertInitializationAllowed();
connectionProperties = props;
- if (connectionProperties.containsKey(KEY_USER)) {
- setUser(connectionProperties.getProperty(KEY_USER));
- }
- if (connectionProperties.containsKey(KEY_PASSWORD)) {
- setPassword(connectionProperties.getProperty(KEY_PASSWORD));
+ if (connectionProperties != null) {
+ if (connectionProperties.containsKey(KEY_USER)) {
+ setUser(connectionProperties.getProperty(KEY_USER));
+ }
+ if (connectionProperties.containsKey(KEY_PASSWORD)) {
+ setPassword(connectionProperties.getProperty(KEY_PASSWORD));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/71841bce/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
index 52e6729..7820796 100644
--- a/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
+++ b/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
@@ -142,7 +142,7 @@ public class TestDriverAdapterCPDS {
}
@Test
- public void testSetProperties() throws Exception {
+ public void testSetConnectionProperties() throws Exception {
// Set user property to bad value
pcds.setUser("bad");
// Supply correct value in connection properties
@@ -163,6 +163,11 @@ public class TestDriverAdapterCPDS {
}
@Test
+ public void testSetConnectionPropertiesNull() throws Exception {
+ pcds.setConnectionProperties(null);
+ }
+
+ @Test
public void testSetUserNull() throws Exception {
pcds.setUser("Alice");
assertEquals("Alice", pcds.getUser());