Repository: commons-dbcp Updated Branches: refs/heads/master abc048454 -> 171528a88
Fix typos reported via Apache Tomcat Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/171528a8 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/171528a8 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/171528a8 Branch: refs/heads/master Commit: 171528a88cca65f5b192be643c2425458d1edfbb Parents: abc0484 Author: Mark Thomas <[email protected]> Authored: Fri Aug 10 16:03:29 2018 +0100 Committer: Mark Thomas <[email protected]> Committed: Fri Aug 10 16:03:29 2018 +0100 ---------------------------------------------------------------------- .../commons/dbcp2/DriverManagerConnectionFactory.java | 10 +++++----- .../apache/commons/dbcp2/managed/ManagedConnection.java | 2 +- .../apache/commons/dbcp2/managed/TransactionContext.java | 2 +- .../commons/dbcp2/managed/TransactionContextListener.java | 4 ++-- .../apache/commons/dbcp2/managed/TransactionRegistry.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/171528a8/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java index 00c7484..c320b2a 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java @@ -47,7 +47,7 @@ public class DriverManagerConnectionFactory implements ConnectionFactory { */ public DriverManagerConnectionFactory(final String connectionUri) { this.connectionUri = connectionUri; - this.propeties = new Properties(); + this.properties = new Properties(); } /** @@ -61,7 +61,7 @@ public class DriverManagerConnectionFactory implements ConnectionFactory { */ public DriverManagerConnectionFactory(final String connectionUri, final Properties properties) { this.connectionUri = connectionUri; - this.propeties = properties; + this.properties = properties; } /** @@ -83,17 +83,17 @@ public class DriverManagerConnectionFactory implements ConnectionFactory { @Override public Connection createConnection() throws SQLException { - if (null == propeties) { + if (null == properties) { if (userName == null && userPassword == null) { return DriverManager.getConnection(connectionUri); } return DriverManager.getConnection(connectionUri, userName, userPassword); } - return DriverManager.getConnection(connectionUri, propeties); + return DriverManager.getConnection(connectionUri, properties); } private final String connectionUri; private String userName; private String userPassword; - private Properties propeties; + private Properties properties; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/171528a8/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java index f9e7d1e..111fc58 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java @@ -204,7 +204,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio */ protected class CompletionListener implements TransactionContextListener { @Override - public void afterCompletion(final TransactionContext completedContext, final boolean commited) { + public void afterCompletion(final TransactionContext completedContext, final boolean committed) { if (completedContext == transactionContext) { transactionComplete(); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/171528a8/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java index 2af9365..01a745b 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java @@ -66,7 +66,7 @@ public class TransactionContext { } /** - * Provided for backwards compatability + * Provided for backwards compatibility * * @param transactionRegistry the TransactionRegistry used to obtain the XAResource for the * shared connection http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/171528a8/src/main/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java index cd47079..332ead6 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java @@ -28,8 +28,8 @@ public interface TransactionContextListener { * * @param transactionContext * the transaction context that completed - * @param commited + * @param committed * true if the transaction committed; false otherwise */ - void afterCompletion(TransactionContext transactionContext, boolean commited); + void afterCompletion(TransactionContext transactionContext, boolean committed); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/171528a8/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 794752d..1a62e9d 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java @@ -61,7 +61,7 @@ public class TransactionRegistry { } /** - * Provided for backwards compatability + * Provided for backwards compatibility * @param transactionManager the transaction manager used to enlist connections */ public TransactionRegistry(final TransactionManager transactionManager) {
