You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2015/02/10 09:59:08 UTC
svn commit: r1658644 - in
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2: ./
cpdsadapter/ datasources/ managed/
Author: tn
Date: Tue Feb 10 08:59:07 2015
New Revision: 1658644
URL: http://svn.apache.org/r1658644
Log:
Fix typos, remove whitespace.
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/package-info.java
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java Tue Feb 10 08:59:07 2015
@@ -41,7 +41,7 @@ import javax.naming.spi.ObjectFactory;
* properties with the following exceptions:</p>
* <ul>
* <li><code>connectionInitSqls</code> must be passed to this factory as a
- * single String using semi-colon to delimt the statements whereas
+ * single String using semi-colon to delimit the statements whereas
* <code>BasicDataSource</code> requires a collection of Strings.</li>
* </ul>
*
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java Tue Feb 10 08:59:07 2015
@@ -95,7 +95,7 @@ public class DelegatingConnection<C exte
/**
* Returns a string representation of the metadata associated with
- * the innnermost delegate connection.
+ * the innermost delegate connection.
*/
@Override
public String toString() {
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java Tue Feb 10 08:59:07 2015
@@ -139,7 +139,7 @@ public class DelegatingStatement extends
_conn = null;
}
- // The JDBC spec requires that a statment close any open
+ // The JDBC spec requires that a statement close any open
// ResultSet's when it is closed.
// FIXME The PreparedStatement we're wrapping should handle this for us.
// See bug 17301 for what could happen when ResultSets are closed twice.
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java Tue Feb 10 08:59:07 2015
@@ -112,7 +112,7 @@ public class PoolableCallableStatement e
getConnectionInternal().removeTrace(this);
}
- // The JDBC spec requires that a statment close any open
+ // The JDBC spec requires that a statement close any open
// ResultSet's when it is closed.
// FIXME The PreparedStatement we're wrapping should handle this for us.
// See DBCP-10 for what could happen when ResultSets are closed twice.
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java Tue Feb 10 08:59:07 2015
@@ -260,7 +260,7 @@ public class PoolableConnection extends
* this connection has previously thrown a fatal disconnection exception,
* a {@code SQLException} is thrown. </li>
* <li>If {@code sql} is null, the driver's
- * #{@link Connection#isValid(int) isvalid(timeout)} is called.
+ * #{@link Connection#isValid(int) isValid(timeout)} is called.
* If it returns {@code false}, {@code SQLException} is thrown;
* otherwise, this method returns successfully.</li>
* <li>If {@code sql} is not null, it is executed as a query and if the resulting
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java Tue Feb 10 08:59:07 2015
@@ -296,7 +296,7 @@ public class PoolingConnection extends D
/**
* Normalize the given SQL statement, producing a
- * cannonical form that is semantically equivalent to the original.
+ * canonical form that is semantically equivalent to the original.
*/
protected String normalizeSQL(String sql) {
return sql.trim();
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java Tue Feb 10 08:59:07 2015
@@ -52,7 +52,7 @@ class ConnectionImpl extends DelegatingC
*
* @param pooledConnection The PooledConnection that is calling the ctor.
* @param connection The JDBC 1.x Connection to wrap.
- * @param accessToUnderlyingConnectionAllowed if true, then access is allowed to the underlying connectiion
+ * @param accessToUnderlyingConnectionAllowed if true, then access is allowed to the underlying connection
*/
ConnectionImpl(PooledConnectionImpl pooledConnection,
Connection connection,
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java Tue Feb 10 08:59:07 2015
@@ -685,7 +685,7 @@ public class DriverAdapterCPDS
}
/**
- * Returns the maximun number of prepared statements.
+ * Returns the maximum number of prepared statements.
*
* @return maxPrepartedStatements value
*/
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java Tue Feb 10 08:59:07 2015
@@ -408,7 +408,7 @@ class PooledConnectionImpl implements Po
/**
* Normalize the given SQL statement, producing a
- * cannonical form that is semantically equivalent to the original.
+ * canonical form that is semantically equivalent to the original.
*/
protected String normalizeSQL(String sql) {
return sql.trim();
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java Tue Feb 10 08:59:07 2015
@@ -187,6 +187,7 @@ public abstract class InstanceKeyDataSou
/**
* Close the connection pool being maintained by this datasource.
*/
+ @Override
public abstract void close() throws Exception;
protected abstract PooledConnectionManager getConnectionManager(UserPassKey upkey);
@@ -231,7 +232,6 @@ public abstract class InstanceKeyDataSou
this.defaultBlockWhenExhausted = blockWhenExhausted;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getEvictionPolicyClassName()} for
@@ -252,7 +252,6 @@ public abstract class InstanceKeyDataSou
this.defaultEvictionPolicyClassName = evictionPolicyClassName;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getLifo()} for each per user pool.
@@ -270,7 +269,6 @@ public abstract class InstanceKeyDataSou
this.defaultLifo = lifo;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getMaxIdlePerKey()} for each per user
@@ -290,7 +288,6 @@ public abstract class InstanceKeyDataSou
this.defaultMaxIdle = maxIdle;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getMaxTotalPerKey()} for each per
@@ -310,7 +307,6 @@ public abstract class InstanceKeyDataSou
this.defaultMaxTotal = maxTotal;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getMaxWaitMillis()} for each per user
@@ -330,7 +326,6 @@ public abstract class InstanceKeyDataSou
this.defaultMaxWaitMillis = maxWaitMillis;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getMinEvictableIdleTimeMillis()} for
@@ -351,7 +346,6 @@ public abstract class InstanceKeyDataSou
this.defaultMinEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getMinIdlePerKey()} for each per user
@@ -371,7 +365,6 @@ public abstract class InstanceKeyDataSou
this.defaultMinIdle = minIdle;
}
-
/**
* Gets the default value for
* {@link GenericKeyedObjectPoolConfig#getNumTestsPerEvictionRun()} for each
@@ -391,7 +384,6 @@ public abstract class InstanceKeyDataSou
this.defaultNumTestsPerEvictionRun = numTestsPerEvictionRun;
}
-
/**
* Gets the default value for
* {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getSoftMinEvictableIdleTimeMillis()} for each
@@ -411,7 +403,6 @@ public abstract class InstanceKeyDataSou
this.defaultSoftMinEvictableIdleTimeMillis = softMinEvictableIdleTimeMillis;
}
-
/**
* Gets the default value for
* {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnCreate()} for each per user pool.
@@ -429,7 +420,6 @@ public abstract class InstanceKeyDataSou
this.defaultTestOnCreate = testOnCreate;
}
-
/**
* Gets the default value for
* {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnBorrow()} for each per user pool.
@@ -447,7 +437,6 @@ public abstract class InstanceKeyDataSou
this.defaultTestOnBorrow = testOnBorrow;
}
-
/**
* Gets the default value for
* {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestOnReturn()} for each per user pool.
@@ -465,7 +454,6 @@ public abstract class InstanceKeyDataSou
this.defaultTestOnReturn = testOnReturn;
}
-
/**
* Gets the default value for
* {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTestWhileIdle()} for each per user pool.
@@ -483,7 +471,6 @@ public abstract class InstanceKeyDataSou
this.defaultTestWhileIdle = testWhileIdle;
}
-
/**
* Gets the default value for
* {@link org.apache.commons.pool2.impl.GenericObjectPool GenericObjectPool#getTimeBetweenEvictionRunsMillis ()} for each
@@ -504,22 +491,6 @@ public abstract class InstanceKeyDataSou
this.defaultTimeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis ;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/**
* Get the value of connectionPoolDataSource. This method will return
* null, if the backing datasource is being accessed via jndi.
@@ -941,7 +912,7 @@ public abstract class InstanceKeyDataSou
}
/*
* Password must have changed -> destroy connection and keep retrying until we get a new, good one,
- * destroying any idle connections with the old passowrd as we pull them from the pool.
+ * destroying any idle connections with the old password as we pull them from the pool.
*/
final UserPassKey upkey = info.getUserPassKey();
final PooledConnectionManager manager = getConnectionManager(upkey);
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java Tue Feb 10 08:59:07 2015
@@ -31,6 +31,7 @@ import javax.sql.ConnectionEventListener
import javax.sql.ConnectionPoolDataSource;
import javax.sql.PooledConnection;
+import org.apache.commons.dbcp2.PoolableConnection;
import org.apache.commons.dbcp2.Utils;
import org.apache.commons.pool2.KeyedObjectPool;
import org.apache.commons.pool2.KeyedPooledObjectFactory;
@@ -160,7 +161,7 @@ class KeyedCPDSConnectionFactory
* @param key ignored
* @param p wrapped {@link PooledConnectionAndInfo} containing the
* connection to validate
- * @return true if validation suceeds
+ * @return true if validation succeeds
*/
@Override
public boolean validateObject(UserPassKey key,
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java Tue Feb 10 08:59:07 2015
@@ -18,6 +18,7 @@
package org.apache.commons.dbcp2.datasources;
import java.sql.SQLException;
+
import javax.sql.PooledConnection;
/**
@@ -37,7 +38,7 @@ interface PooledConnectionManager {
void invalidate(PooledConnection pc) throws SQLException;
/**
- * Sets the databsase password used when creating connections.
+ * Sets the database password used when creating connections.
*
* @param password password used when authenticating to the database
*/
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java Tue Feb 10 08:59:07 2015
@@ -17,14 +17,14 @@
*/
package org.apache.commons.dbcp2.managed;
-import org.apache.commons.dbcp2.ConnectionFactory;
-
import java.sql.Connection;
import java.sql.SQLException;
+import org.apache.commons.dbcp2.ConnectionFactory;
+
/**
* XAConnectionFactory is an extension of ConnectionFactory used to create connections
- * in a transaction managed environment. The XAConnectionFactory opperates like a normal
+ * in a transaction managed environment. The XAConnectionFactory operates like a normal
* ConnectionFactory except an 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
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/package-info.java?rev=1658644&r1=1658643&r2=1658644&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/package-info.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/package-info.java Tue Feb 10 08:59:07 2015
@@ -20,7 +20,7 @@
* This package provides support for pooling of ManagedConnections. A managed
* connection is responsible for managing a database connection in a
* transactional environment (typically called <i>Container Managed</i>).
- * A managed connection opperates like any other connection when no gloabal
+ * A managed connection operates like any other connection when no global
* transaction (a.k.a. XA transaction or JTA Transaction) is in progress.
* When a global transaction is active a single physical connection to the
* database is used by all ManagedConnections accessed in the scope of the