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 ea61b18 Convert to upper case once. ea61b18 is described below commit ea61b18e661c7feb955a751e49d09643be67f3c4 Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Mon Aug 23 13:22:57 2021 -0400 Convert to upper case once. Whitepace. --- src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 2 +- .../org/apache/commons/dbcp2/BasicDataSourceFactory.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java index a2886ae..dba92d6 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -100,7 +100,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Validates the given factory. - * + * * @param connectionFactory the factory * @throws Exception Thrown by one of the factory methods while managing a temporary pooled object. */ diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java index b932ee1..2340516 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java @@ -29,6 +29,7 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -224,16 +225,17 @@ public class BasicDataSourceFactory implements ObjectFactory { acceptBoolean(properties, PROP_DEFAULT_READ_ONLY, dataSource::setDefaultReadOnly); getOptional(properties, PROP_DEFAULT_TRANSACTION_ISOLATION).ifPresent(value -> { + value = value.toUpperCase(Locale.ROOT); int level = PoolableConnectionFactory.UNKNOWN_TRANSACTION_ISOLATION; - if ("NONE".equalsIgnoreCase(value)) { + if ("NONE".equals(value)) { level = Connection.TRANSACTION_NONE; - } else if ("READ_COMMITTED".equalsIgnoreCase(value)) { + } else if ("READ_COMMITTED".equals(value)) { level = Connection.TRANSACTION_READ_COMMITTED; - } else if ("READ_UNCOMMITTED".equalsIgnoreCase(value)) { + } else if ("READ_UNCOMMITTED".equals(value)) { level = Connection.TRANSACTION_READ_UNCOMMITTED; - } else if ("REPEATABLE_READ".equalsIgnoreCase(value)) { + } else if ("REPEATABLE_READ".equals(value)) { level = Connection.TRANSACTION_REPEATABLE_READ; - } else if ("SERIALIZABLE".equalsIgnoreCase(value)) { + } else if ("SERIALIZABLE".equals(value)) { level = Connection.TRANSACTION_SERIALIZABLE; } else { try {