[commons-dbcp] branch master updated: Use Map API directly.

[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 32b47c3  Use Map API directly.
32b47c3 is described below

commit 32b47c342191fbcfeb13d9d0c9809e96479de1f4
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun May 24 16:59:51 2020 -0400

    Use Map API directly.
---
 src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java 
b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
index 945d163..37a2ffe 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
@@ -255,7 +255,7 @@ public class BasicDataSourceFactory implements 
ObjectFactory {
             final List<String> infoMessages) {
         final List<String> allPropsAsList = Arrays.asList(ALL_PROPERTIES);
         final String nameString = name != null ? "Name = " + name.toString() + 
" " : "";
-        if (NUPROP_WARNTEXT != null && !NUPROP_WARNTEXT.keySet().isEmpty()) {
+        if (NUPROP_WARNTEXT != null && !NUPROP_WARNTEXT.isEmpty()) {
             for (final String propertyName : NUPROP_WARNTEXT.keySet()) {
                 final RefAddr ra = ref.get(propertyName);
                 if (ra != null && !allPropsAsList.contains(ra.getType())) {
@@ -275,7 +275,7 @@ public class BasicDataSourceFactory implements 
ObjectFactory {
             final String propertyName = ra.getType();
             // If property name is not in the properties list, we haven't 
warned on it
             // and it is not in the "silent" list, tell user we are ignoring 
it.
-            if (!(allPropsAsList.contains(propertyName) || 
NUPROP_WARNTEXT.keySet().contains(propertyName)
+            if (!(allPropsAsList.contains(propertyName) || 
NUPROP_WARNTEXT.containsKey(propertyName)
                     || SILENT_PROPERTIES.contains(propertyName))) {
                 final String propertyValue = ra.getContent().toString();
                 final StringBuilder stringBuilder = new 
StringBuilder(nameString);