Repository: commons-dbcp Updated Branches: refs/heads/master 8d719d4ea -> db4130171
Fix typo in package private constant name. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/db413017 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/db413017 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/db413017 Branch: refs/heads/master Commit: db4130171a9fdd567b86b73b8538d3d9d802e60a Parents: 8d719d4 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Tue Nov 13 13:09:49 2018 -0700 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Tue Nov 13 13:09:49 2018 -0700 ---------------------------------------------------------------------- src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 2 +- .../java/org/apache/commons/dbcp2/BasicDataSourceFactory.java | 4 ++-- .../org/apache/commons/dbcp2/PoolableConnectionFactory.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/db413017/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java index 5a1d84d..84ce723 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -164,7 +164,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The default TransactionIsolation state of connections created by this pool. */ - private volatile int defaultTransactionIsolation = PoolableConnectionFactory.UNKNOWN_TRANSACTIONISOLATION; + private volatile int defaultTransactionIsolation = PoolableConnectionFactory.UNKNOWN_TRANSACTION_ISOLATION; /** * Returns the default transaction isolation state of returned connections. http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/db413017/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java index 959aecf..3871b56 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java @@ -309,7 +309,7 @@ public class BasicDataSourceFactory implements ObjectFactory { value = properties.getProperty(PROP_DEFAULTTRANSACTIONISOLATION); if (value != null) { - int level = PoolableConnectionFactory.UNKNOWN_TRANSACTIONISOLATION; + int level = PoolableConnectionFactory.UNKNOWN_TRANSACTION_ISOLATION; if ("NONE".equalsIgnoreCase(value)) { level = Connection.TRANSACTION_NONE; } else if ("READ_COMMITTED".equalsIgnoreCase(value)) { @@ -327,7 +327,7 @@ public class BasicDataSourceFactory implements ObjectFactory { System.err.println("Could not parse defaultTransactionIsolation: " + value); System.err.println("WARNING: defaultTransactionIsolation not set"); System.err.println("using default value of database driver"); - level = PoolableConnectionFactory.UNKNOWN_TRANSACTIONISOLATION; + level = PoolableConnectionFactory.UNKNOWN_TRANSACTION_ISOLATION; } } dataSource.setDefaultTransactionIsolation(level); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/db413017/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java index 74ccacf..0f5a8ba 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -430,7 +430,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo if (defaultAutoCommit != null && conn.getAutoCommit() != defaultAutoCommit.booleanValue()) { conn.setAutoCommit(defaultAutoCommit.booleanValue()); } - if (defaultTransactionIsolation != UNKNOWN_TRANSACTIONISOLATION + if (defaultTransactionIsolation != UNKNOWN_TRANSACTION_ISOLATION && conn.getTransactionIsolation() != defaultTransactionIsolation) { conn.setTransactionIsolation(defaultTransactionIsolation); } @@ -504,7 +504,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo private Boolean defaultAutoCommit; private boolean enableAutoCommitOnReturn = true; private boolean rollbackOnReturn = true; - private int defaultTransactionIsolation = UNKNOWN_TRANSACTIONISOLATION; + private int defaultTransactionIsolation = UNKNOWN_TRANSACTION_ISOLATION; private String defaultCatalog; private String defaultSchema; private boolean cacheState; @@ -517,7 +517,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo /** * Internal constant to indicate the level is not set. */ - static final int UNKNOWN_TRANSACTIONISOLATION = -1; + static final int UNKNOWN_TRANSACTION_ISOLATION = -1; /** * @since 2.6.0
