Repository: commons-dbcp Updated Branches: refs/heads/master 16626a9b8 -> 91dc9948f
Remove trailing white spaces on all lines. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/91dc9948 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/91dc9948 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/91dc9948 Branch: refs/heads/master Commit: 91dc9948fcd4d6b2c5e5223d6030c4855d337b60 Parents: 16626a9 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Mon Jun 11 18:43:18 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Mon Jun 11 18:43:18 2018 -0600 ---------------------------------------------------------------------- .../org/apache/commons/dbcp2/Constants.java | 2 +- .../commons/dbcp2/DelegatingConnection.java | 10 ++--- .../commons/dbcp2/DelegatingResultSet.java | 8 ++-- .../commons/dbcp2/DriverConnectionFactory.java | 2 +- .../java/org/apache/commons/dbcp2/PStmtKey.java | 46 ++++++++++---------- .../dbcp2/PoolableConnectionFactory.java | 2 +- .../apache/commons/dbcp2/PoolingConnection.java | 10 ++--- .../org/apache/commons/dbcp2/PoolingDriver.java | 8 ++-- .../java/org/apache/commons/dbcp2/Utils.java | 6 +-- .../dbcp2/managed/BasicManagedDataSource.java | 10 ++--- .../managed/DataSourceXAConnectionFactory.java | 4 +- .../dbcp2/managed/LocalXAConnectionFactory.java | 2 +- .../dbcp2/managed/ManagedConnection.java | 8 ++-- .../dbcp2/managed/ManagedDataSource.java | 2 +- .../dbcp2/managed/TransactionContext.java | 4 +- .../managed/TransactionContextListener.java | 2 +- .../dbcp2/managed/TransactionRegistry.java | 10 ++--- 17 files changed, 68 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/Constants.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/Constants.java b/src/main/java/org/apache/commons/dbcp2/Constants.java index 36fb0ec..4f09839 100644 --- a/src/main/java/org/apache/commons/dbcp2/Constants.java +++ b/src/main/java/org/apache/commons/dbcp2/Constants.java @@ -18,7 +18,7 @@ package org.apache.commons.dbcp2; /** * Constants for use with JMX. - * + * * @since 2.0 */ public class Constants { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index 08ef8c1..0fbc9ee 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -174,8 +174,8 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace * {@code DelegatingConnection}s, and you want to make * sure to obtain a "genuine" {@link Connection}. * </p> - * - * @return innermost delegate. + * + * @return innermost delegate. */ public Connection getInnermostDelegate() { return getInnermostDelegateInternal(); @@ -186,8 +186,8 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace * Although this method is public, it is part of the internal API and should * not be used by clients. The signature of this method may change at any * time including in ways that break backwards compatibility. - * - * @return innermost delegate. + * + * @return innermost delegate. */ public final Connection getInnermostDelegateInternal() { Connection c = connection; @@ -202,7 +202,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace /** * Sets my delegate. - * + * * @param connection * my delegate. */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java index e50ee25..fbfef78 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -106,7 +106,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS /** * Wraps the given result set in a delegate. - * + * * @param statement * The Statement which created the ResultSet. * @param resultSet @@ -122,7 +122,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS /** * Wraps the given result set in a delegate. - * + * * @param connection * The Connection which created the ResultSet. * @param resultSet @@ -138,7 +138,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS /** * Gets my delegate. - * + * * @return my delegate. */ public ResultSet getDelegate() { @@ -161,7 +161,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS * {@code DelegatingResultSet}s, and you want to make * sure to obtain a "genuine" {@link ResultSet}. * </p> - * + * * @return the innermost delegate. */ public ResultSet getInnermostDelegate() { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java index c7d5716..42de432 100644 --- a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java @@ -34,7 +34,7 @@ public class DriverConnectionFactory implements ConnectionFactory { /** * Constructs a connection factory for a given Driver. - * + * * @param driver * The Driver. * @param connectString http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/PStmtKey.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java index 6fc5f65..c70c3b6 100644 --- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java +++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java @@ -26,7 +26,7 @@ import org.apache.commons.dbcp2.PoolingConnection.StatementType; /** * A key uniquely identifying {@link java.sql.PreparedStatement PreparedStatement}s. - * + * * @since 2.0 */ public class PStmtKey { @@ -63,7 +63,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. */ @@ -73,7 +73,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -85,7 +85,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -113,7 +113,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -128,7 +128,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -160,7 +160,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -185,7 +185,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -209,7 +209,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param resultSetType @@ -225,7 +225,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -243,7 +243,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -278,7 +278,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -300,7 +300,7 @@ public class PStmtKey { /** * Constructs a key to uniquely identify a prepared statement. - * + * * @param sql * The SQL statement. * @param catalog @@ -338,7 +338,7 @@ public class PStmtKey { /** * Gets the SQL statement. - * + * * @return the SQL statement. */ public String getSql() { @@ -348,7 +348,7 @@ public class PStmtKey { /** * Gets the result set type, one of <code>ResultSet.TYPE_FORWARD_ONLY</code>, * <code>ResultSet.TYPE_SCROLL_INSENSITIVE</code>, or <code>ResultSet.TYPE_SCROLL_SENSITIVE</code>. - * + * * @return the result set type. */ public Integer getResultSetType() { @@ -358,7 +358,7 @@ public class PStmtKey { /** * Gets the result set concurrency type; one of <code>ResultSet.CONCUR_READ_ONLY</code> or * <code>ResultSet.CONCUR_UPDATABLE</code>. - * + * * @return The result set concurrency type. */ public Integer getResultSetConcurrency() { @@ -368,7 +368,7 @@ public class PStmtKey { /** * Gets the result set holdability, one of the following <code>ResultSet</code> constants: * <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>. - * + * * @return The result set holdability. */ public Integer getResultSetHoldability() { @@ -378,7 +378,7 @@ public class PStmtKey { /** * Gets a flag indicating whether auto-generated keys should be returned; one of * <code>Statement.RETURN_GENERATED_KEYS</code> or <code>Statement.NO_GENERATED_KEYS</code>. - * + * * @return a flag indicating whether auto-generated keys should be returned. */ public Integer getAutoGeneratedKeys() { @@ -387,7 +387,7 @@ public class PStmtKey { /** * Gets an array of column indexes indicating the columns that should be returned from the inserted row or rows. - * + * * @return An array of column indexes. */ public int[] getColumnIndexes() { @@ -396,7 +396,7 @@ public class PStmtKey { /** * Gets an array of column names indicating the columns that should be returned from the inserted row or rows. - * + * * @return An array of column names. */ public String[] getColumnNames() { @@ -405,7 +405,7 @@ public class PStmtKey { /** * The catalog. - * + * * @return The catalog. */ public String getCatalog() { @@ -414,7 +414,7 @@ public class PStmtKey { /** * The SQL statement type. - * + * * @return The SQL statement type. */ public StatementType getStmtType() { @@ -529,7 +529,7 @@ public class PStmtKey { /** * Creates a new Statement from the given Connection. - * + * * @param connection * The Connection to use to create the statement. * @return The statement. http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/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 41d74a5..476b84e 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -178,7 +178,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo /** * Sets the maximum lifetime in milliseconds of a connection after which the connection will always fail activation, * passivation and validation. A value of zero or less indicates an infinite lifetime. The default value is -1. - * + * * @param maxConnLifetimeMillis * The maximum lifetime in milliseconds. */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java index edf07e1..58c4b32 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java @@ -475,7 +475,7 @@ public class PoolingConnection extends DelegatingConnection<Connection> /** * Creates or obtains a {@link PreparedStatement} from the pool. - * + * * @param sql * the SQL string used to define the PreparedStatement * @param columnIndexes @@ -500,7 +500,7 @@ public class PoolingConnection extends DelegatingConnection<Connection> /** * Creates or obtains a {@link PreparedStatement} from the pool. - * + * * @param sql * the SQL string used to define the PreparedStatement * @param resultSetType @@ -528,7 +528,7 @@ public class PoolingConnection extends DelegatingConnection<Connection> /** * Creates or obtains a {@link PreparedStatement} from the pool. - * + * * @param sql * the SQL string used to define the PreparedStatement * @param resultSetType @@ -558,7 +558,7 @@ public class PoolingConnection extends DelegatingConnection<Connection> /** * Creates or obtains a {@link PreparedStatement} from the pool. - * + * * @param sql * the SQL string used to define the PreparedStatement * @param columnNames @@ -583,7 +583,7 @@ public class PoolingConnection extends DelegatingConnection<Connection> /** * Sets the prepared statement pool. - * + * * @param pool * the prepared statement pool. */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java index 2423d19..87ff2ba 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java @@ -82,7 +82,7 @@ public class PoolingDriver implements Driver { /** * Gets the connection pool for the given name. - * + * * @param name * The pool name * @return The pool @@ -100,7 +100,7 @@ public class PoolingDriver implements Driver { /** * Registers a named pool. - * + * * @param name * The pool name. * @param pool @@ -113,7 +113,7 @@ public class PoolingDriver implements Driver { /** * Closes a named pool. - * + * * @param name * The pool name. * @throws SQLException @@ -135,7 +135,7 @@ public class PoolingDriver implements Driver { /** * Gets the pool names. - * + * * @return the pool names. */ public synchronized String[] getPoolNames(){ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/Utils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java b/src/main/java/org/apache/commons/dbcp2/Utils.java index 059f3d9..8e798c4 100644 --- a/src/main/java/org/apache/commons/dbcp2/Utils.java +++ b/src/main/java/org/apache/commons/dbcp2/Utils.java @@ -28,7 +28,7 @@ import java.util.Set; /** * Utility methods. - * + * * @since 2.0 */ public final class Utils { @@ -121,7 +121,7 @@ public final class Utils { /** * Gets the correct i18n message for the given key. - * + * * @param key * The key to look up an i18n message. * @return The i18n message. @@ -132,7 +132,7 @@ public final class Utils { /** * Gets the correct i18n message for the given key with placeholders replaced by the supplied arguments. - * + * * @param key * A message key. * @param args http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java index c685134..329c0bd 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java @@ -91,7 +91,7 @@ public class BasicManagedDataSource extends BasicDataSource { /** * Gets the required transaction manager property. - * + * * @return the transaction manager used to enlist connections */ public TransactionManager getTransactionManager() { @@ -100,7 +100,7 @@ public class BasicManagedDataSource extends BasicDataSource { /** * Gets the transaction registry. - * + * * @return the transaction registry associating XAResources with managed connections */ protected synchronized TransactionRegistry getTransactionRegistry() { @@ -109,7 +109,7 @@ public class BasicManagedDataSource extends BasicDataSource { /** * Sets the required transaction manager property. - * + * * @param transactionManager * the transaction manager used to enlist connections */ @@ -119,7 +119,7 @@ public class BasicManagedDataSource extends BasicDataSource { /** * Gets the optional XADataSource class name. - * + * * @return the optional XADataSource class name */ public synchronized String getXADataSource() { @@ -128,7 +128,7 @@ public class BasicManagedDataSource extends BasicDataSource { /** * Sets the optional XADataSource class name. - * + * * @param xaDataSource * the optional XADataSource class name */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java index 7e974e0..661ea62 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java @@ -98,7 +98,7 @@ public class DataSourceXAConnectionFactory implements XAConnectionFactory { /** * Gets the user name used to authenticate new connections. - * + * * @return the user name or null if unauthenticated connections are used */ public String getUsername() { @@ -107,7 +107,7 @@ public class DataSourceXAConnectionFactory implements XAConnectionFactory { /** * Sets the user name used to authenticate new connections. - * + * * @param userName * the user name used for authenticating the connection or null for unauthenticated */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java index 00a6992..1eb3c0e 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java @@ -84,7 +84,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory { * </p> * It is assumed that the wrapper around a managed connection disables the setAutoCommit(), commit(), rollback() and * setReadOnly() methods while a transaction is in progress. - * + * * @since 2.0 */ protected static class LocalXAResource implements XAResource { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/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 91fed32..4906c3a 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java @@ -45,7 +45,7 @@ import java.util.concurrent.locks.ReentrantLock; * @since 2.0 */ public class ManagedConnection<C extends Connection> extends DelegatingConnection<C> { - + private final ObjectPool<C> pool; private final TransactionRegistry transactionRegistry; private final boolean accessToUnderlyingConnectionAllowed; @@ -55,7 +55,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio /** * Constructs a new instance responsible for managing a database connection in a transactional environment. - * + * * @param pool * The connection pool. * @param transactionRegistry @@ -195,7 +195,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio /** * Delegates to {@link ManagedConnection#transactionComplete()} for transaction completion events. - * + * * @since 2.0 */ protected class CompletionListener implements TransactionContextListener { @@ -279,7 +279,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio /** * If false, getDelegate() and getInnermostDelegate() will return null. - * + * * @return if false, getDelegate() and getInnermostDelegate() will return null */ public boolean isAccessToUnderlyingConnectionAllowed() { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java index 5e3b784..edd9ae7 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java @@ -55,7 +55,7 @@ public class ManagedDataSource<C extends Connection> extends PoolingDataSource<C /** * Sets the transaction registry from the XAConnectionFactory used to create the pool. The transaction registry can * only be set once using either a connector or this setter method. - * + * * @param transactionRegistry * the transaction registry acquired from the XAConnectionFactory used to create the pool */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/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 dfb6ebd..f4065d6 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java @@ -61,7 +61,7 @@ public class TransactionContext { /** * Gets the connection shared by all ManagedConnections in the transaction. Specifically, connection using the same * XAConnectionFactory from which the TransactionRegistry was obtained. - * + * * @return the shared connection for this transaction */ public Connection getSharedConnection() { @@ -133,7 +133,7 @@ public class TransactionContext { /** * True if the transaction is active or marked for rollback only. - * + * * @return true if the transaction is active or marked for rollback only; false otherwise * @throws SQLException * if a problem occurs obtaining the transaction status http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/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 8506d28..cd47079 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionContextListener.java @@ -25,7 +25,7 @@ package org.apache.commons.dbcp2.managed; public interface TransactionContextListener { /** * Occurs after the transaction commits or rolls back. - * + * * @param transactionContext * the transaction context that completed * @param commited http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/91dc9948/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 70aa23c..1cd28c1 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java @@ -36,7 +36,7 @@ import org.apache.commons.dbcp2.DelegatingConnection; * The TransactionRegistry hides the details of transaction processing from the existing DBCP pooling code, and gives * the ManagedConnection a way to enlist connections in a transaction, allowing for the maximal rescue of DBCP. * </p> - * + * * @since 2.0 */ public class TransactionRegistry { @@ -46,7 +46,7 @@ public class TransactionRegistry { /** * Creates a TransactionRegistry for the specified transaction manager. - * + * * @param transactionManager * the transaction manager used to enlist connections. */ @@ -71,7 +71,7 @@ public class TransactionRegistry { /** * Gets the XAResource registered for the connection. - * + * * @param connection * the connection * @return The XAResource registered for the connection; never null. @@ -90,7 +90,7 @@ public class TransactionRegistry { /** * Gets the active TransactionContext or null if not Transaction is active. - * + * * @return The active TransactionContext or null if no Transaction is active. * @throws SQLException * Thrown when an error occurs while fetching the transaction. @@ -124,7 +124,7 @@ public class TransactionRegistry { /** * Unregisters a destroyed connection from {@link TransactionRegistry}. - * + * * @param connection * A destroyed connection from {@link TransactionRegistry}. */
