Repository: commons-dbcp Updated Branches: refs/heads/master e2f101cc5 -> 1edcd55fc
The the patrol. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/1edcd55f Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/1edcd55f Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/1edcd55f Branch: refs/heads/master Commit: 1edcd55fc5b2627f4eb52111f955af589a47adc7 Parents: e2f101c Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sat Jun 16 16:16:15 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sat Jun 16 16:16:15 2018 -0600 ---------------------------------------------------------------------- .../java/org/apache/commons/dbcp2/managed/TransactionRegistry.java | 2 +- .../java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/1edcd55f/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java index 1cd28c1..250d6dc 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java @@ -111,7 +111,7 @@ public class TransactionRegistry { throw new SQLException("Unable to determine current transaction ", e); } - // register the the context (or create a new one) + // register the context (or create a new one) synchronized (this) { TransactionContext cache = caches.get(transaction); if (cache == null) { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/1edcd55f/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java index 09d4af9..60292ad 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java @@ -26,7 +26,7 @@ import org.apache.commons.dbcp2.ConnectionFactory; * XAConnectionFactory is an extension of ConnectionFactory used to create connections in a transaction managed * environment. The XAConnectionFactory operates like a normal ConnectionFactory except a TransactionRegistry is * provided from which the XAResource for a connection can be obtained. This allows the existing DBCP pool code to work - * with XAConnections and gives a the ManagedConnection a way to enlist a connection in the the transaction. + * with XAConnections and gives a the ManagedConnection a way to enlist a connection in the transaction. * * @since 2.0 */
