Repository: commons-dbcp Updated Branches: refs/heads/master 6c5e19846 -> 7dd3b68cc
Fix spelling mistakes (closes #6) patch supplied by Josh Soref Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/7dd3b68c Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/7dd3b68c Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/7dd3b68c Branch: refs/heads/master Commit: 7dd3b68cce4a731b635b766f745d76ab4b009eec Parents: 6c5e198 Author: Pascal Schumacher <[email protected]> Authored: Sun Oct 8 15:47:47 2017 +0200 Committer: Pascal Schumacher <[email protected]> Committed: Sun Oct 8 15:47:47 2017 +0200 ---------------------------------------------------------------------- build.xml | 2 +- src/changes/changes.xml | 6 ++--- .../dbcp2/DelegatingDatabaseMetaData.java | 2 +- .../commons/dbcp2/DelegatingResultSet.java | 2 +- .../commons/dbcp2/DelegatingStatement.java | 2 +- .../java/org/apache/commons/dbcp2/PStmtKey.java | 24 ++++++++++---------- .../commons/dbcp2/PoolableConnection.java | 6 ++--- .../dbcp2/cpdsadapter/DriverAdapterCPDS.java | 2 +- .../commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 2 +- .../dbcp2/managed/BasicManagedDataSource.java | 2 +- .../managed/DataSourceXAConnectionFactory.java | 2 +- .../dbcp2/managed/LocalXAConnectionFactory.java | 2 +- src/site/xdoc/configuration.xml | 4 ++-- src/site/xdoc/mail-lists.xml | 2 +- src/site/xdoc/release-notes-1.1.xml | 4 ++-- src/site/xdoc/release-notes-1.2.xml | 4 ++-- .../dbcp2/TestAbandonedBasicDataSource.java | 2 +- .../commons/dbcp2/TestConnectionPool.java | 4 ++-- .../java/org/apache/commons/dbcp2/TestJndi.java | 2 +- .../dbcp2/TestPStmtPoolingBasicDataSource.java | 2 +- 20 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b65bee5..d60fdb1 100644 --- a/build.xml +++ b/build.xml @@ -64,7 +64,7 @@ <property name="test.runner" value="junit.textui.TestRunner" /> <property name="javadoc.dir" value="${dist.dir}/docs/api"/> - <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2015 Apache Software Foundation. Documenation generated ${TODAY}</small>."/> + <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2015 Apache Software Foundation. Documentation generated ${TODAY}</small>."/> <property name="javadoc.overview" value="${basedir}/src/main/java/org/apache/commons/dbcp2/overview.html"/> <property name="javac.optimize" value="false"/> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d6f13c7..31963af 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -192,7 +192,7 @@ The <action> type attribute can be add,update,fix,remove. Made Datasources implement AutoCloseable. </action> <action issue="DBCP-427" dev="psteitz" type="add" due-to="Vladimir Konkov"> - Added fastFailValidation property to PooloableConnection, configurable in + Added fastFailValidation property to PoolableConnection, configurable in BasicDataSource. When set to true, connections that have previously thrown fatal disconnection errors will fail validation immediately (no driver calls). </action> @@ -624,7 +624,7 @@ The <action> type attribute can be add,update,fix,remove. Eliminated direct System.out calls in AbandonedTrace. </action> <action dev="niallp" type="fix" issue="DBCP-264"> - Modified DelegatingStatment close to clear open batches. + Modified DelegatingStatement close to clear open batches. </action> <action dev="psteitz" type="fix" issue="DBCP-255"> Eliminated unused private "parent" field in AbandonedTrace. @@ -706,7 +706,7 @@ The <action> type attribute can be add,update,fix,remove. <action dev="psteitz" type="fix" issue="DBCP-237" due-to="Oliver Matz"> Added exception handler to ensure that PooledConnections are not orphaned when an exception occurs in setUpDefaults or clearWarnings in - IntanceKeyDataSource.getConnection. + InstanceKeyDataSource.getConnection. </action> <action dev="psteitz" type="fix" issue="DBCP-252" due-to="FindBugs"> Made getPool synchronized in PoolableConnectionFactory. http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java index fb99c21..22ee27f 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java @@ -59,7 +59,7 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData { * Hence this method will return the first * delegate that is not a {@code DelegatingResultSet}, * or {@code null} when no non-{@code DelegatingResultSet} - * delegate can be found by transversing this chain. + * delegate can be found by traversing this chain. * <p> * This method is useful when you may have nested * {@code DelegatingResultSet}s, and you want to make http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/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 e1c22ca..4d90a17 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java @@ -128,7 +128,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS * Hence this method will return the first * delegate that is not a {@code DelegatingResultSet}, * or {@code null} when no non-{@code DelegatingResultSet} - * delegate can be found by transversing this chain. + * delegate can be found by traversing this chain. * <p> * This method is useful when you may have nested * {@code DelegatingResultSet}s, and you want to make http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java index 4d16198..7ad0ddf 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java @@ -81,7 +81,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement { * Hence this method will return the first * delegate that is not a {@code DelegatingStatement} * or {@code null} when no non-{@code DelegatingStatement} - * delegate can be found by transversing this chain. + * delegate can be found by traversing this chain. * <p> * This method is useful when you may have nested * {@code DelegatingStatement}s, and you want to make http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/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 57060a5..f1131f3 100644 --- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java +++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java @@ -58,7 +58,7 @@ public class PStmtKey { private final StatementType _stmtType; /** Statement builder */ - private StatementeBuilder builder; + private StatementBuilder builder; public PStmtKey(final String sql) { this(sql, null, StatementType.PREPARED_STATEMENT); @@ -324,7 +324,7 @@ public class PStmtKey { buf.append(Arrays.toString(_columnIndexes)); buf.append(", columnNames="); buf.append(Arrays.toString(_columnNames)); - buf.append(", statmentType="); + buf.append(", statementType="); buf.append(_stmtType); return buf.toString(); } @@ -337,14 +337,14 @@ public class PStmtKey { /** * Interface for Prepared or Callable Statement */ - private interface StatementeBuilder { + private interface StatementBuilder { public Statement createStatement(Connection connection) throws SQLException; } /** * Builder for prepareStatement(String sql) */ - private class PreparedStatementSQL implements StatementeBuilder { + private class PreparedStatementSQL implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareStatement(_sql); @@ -355,7 +355,7 @@ public class PStmtKey { /** * Builder for prepareStatement(String sql, int autoGeneratedKeys) */ - private class PreparedStatementWithAutoGeneratedKeys implements StatementeBuilder { + private class PreparedStatementWithAutoGeneratedKeys implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareStatement( @@ -367,7 +367,7 @@ public class PStmtKey { /** * Builder for prepareStatement(String sql, int[] columnIndexes) */ - private class PreparedStatementWithColumnIndexes implements StatementeBuilder { + private class PreparedStatementWithColumnIndexes implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareStatement( @@ -379,7 +379,7 @@ public class PStmtKey { /** * Builder for prepareStatement(String sql, int resultSetType, int resultSetConcurrency) */ - private class PreparedStatementWithResultSetConcurrency implements StatementeBuilder { + private class PreparedStatementWithResultSetConcurrency implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareStatement( @@ -391,7 +391,7 @@ public class PStmtKey { /** * Builder for prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) */ - private class PreparedStatementWithResultSetHoldability implements StatementeBuilder { + private class PreparedStatementWithResultSetHoldability implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareStatement( @@ -404,7 +404,7 @@ public class PStmtKey { /** * Builder for prepareStatement(String sql, String[] columnNames) */ - private class PreparedStatementWithColumnNames implements StatementeBuilder { + private class PreparedStatementWithColumnNames implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareStatement( @@ -416,7 +416,7 @@ public class PStmtKey { /** * Builder for prepareCall(String sql) */ - private class PreparedCallSQL implements StatementeBuilder { + private class PreparedCallSQL implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareCall(_sql); @@ -427,7 +427,7 @@ public class PStmtKey { /** * Builder for prepareCall(String sql, int resultSetType, int resultSetConcurrency) */ - private class PreparedCallWithResultSetConcurrency implements StatementeBuilder { + private class PreparedCallWithResultSetConcurrency implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareCall( @@ -439,7 +439,7 @@ public class PStmtKey { /** * Builder for prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) */ - private class PreparedCallWithResultSetHoldability implements StatementeBuilder { + private class PreparedCallWithResultSetHoldability implements StatementBuilder { @Override public Statement createStatement(Connection connection) throws SQLException { PreparedStatement statement = connection.prepareCall( http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java index c21d1ba..72da67a 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java @@ -164,9 +164,9 @@ public class PoolableConnection extends DelegatingConnection<Connection> return; } - boolean isUnderlyingConectionClosed; + boolean isUnderlyingConnectionClosed; try { - isUnderlyingConectionClosed = getDelegateInternal().isClosed(); + isUnderlyingConnectionClosed = getDelegateInternal().isClosed(); } catch (final SQLException e) { try { _pool.invalidateObject(this); @@ -186,7 +186,7 @@ public class PoolableConnection extends DelegatingConnection<Connection> * may have been borrowed by another thread. Therefore, the close flag * is set in passivate(). */ - if (isUnderlyingConectionClosed) { + if (isUnderlyingConnectionClosed) { // Abnormal close: underlying connection closed unexpectedly, so we // must destroy this proxy try { http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java index 7fbb99e..8553e4a 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java @@ -70,7 +70,7 @@ import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig; * * <p> * The DriverAdapterCPDS also provides <code>PreparedStatement</code> pooling - * which is not generally available in jbdc2 + * which is not generally available in jdbc2 * <code>ConnectionPoolDataSource</code> implementation, but is * addressed within the jdbc3 specification. The <code>PreparedStatement</code> * pool in DriverAdapterCPDS has been in the dbcp package for some time, but http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java index 0531826..c158925 100644 --- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java +++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java @@ -124,7 +124,7 @@ public class PStmtKeyCPDS extends PStmtKey { buf.append(getResultSetType()); buf.append(", resultSetConcurrency="); buf.append(getResultSetConcurrency()); - buf.append(", statmentType="); + buf.append(", statementType="); buf.append(getStmtType()); buf.append(", resultSetHoldability="); buf.append(_resultSetHoldability); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/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 ed8e8b7..1c6d878 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java @@ -158,7 +158,7 @@ public class BasicManagedDataSource extends BasicDataSource { } } - // finally, create the XAConectionFactory using the XA data source + // finally, create the XAConnectionFactory using the XA data source final XAConnectionFactory xaConnectionFactory = new DataSourceXAConnectionFactory(getTransactionManager(), xaDataSourceInstance, getUsername(), getPassword()); transactionRegistry = xaConnectionFactory.getTransactionRegistry(); return xaConnectionFactory; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/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 1e6d1bb..2f1bb3f 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java @@ -105,7 +105,7 @@ public class DataSourceXAConnectionFactory implements XAConnectionFactory { @Override public Connection createConnection() throws SQLException { - // create a new XAConection + // create a new XAConnection XAConnection xaConnection; if (username == null) { xaConnection = xaDataSource.getXAConnection(); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/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 68b0205..2d7e31f 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java @@ -226,7 +226,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory { try { // make sure the connection isn't already closed if (connection.isClosed()) { - throw new XAException("Conection is closed"); + throw new XAException("Connection is closed"); } // A read only connection should not be committed http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/site/xdoc/configuration.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/configuration.xml b/src/site/xdoc/configuration.xml index 6fe6e8f..eabb23a 100644 --- a/src/site/xdoc/configuration.xml +++ b/src/site/xdoc/configuration.xml @@ -283,7 +283,7 @@ isValid() method. <td>1000 * 60 * 30</td> <td> The minimum amount of time an object may sit idle in the pool before it - is eligable for eviction by the idle object evictor (if any). + is eligible for eviction by the idle object evictor (if any). </td> </tr> <tr> @@ -420,7 +420,7 @@ Be careful and only use when you need direct access to driver specific extension applications which fail to close connections.<br/> Setting removeAbandonedOnMaintenance to true removes abandoned connections on the maintenance cycle (when eviction ends). This property has no effect unless maintenance - is enabled by setting timeBetweenEvicionRunsMillis to a positive value. <br/> + is enabled by setting timeBetweenEvictionRunsMillis to a positive value. <br/> If removeAbandonedOnBorrow is true, abandoned connections are removed each time a connection is borrowed from the pool, with the additional requirements that <ul><li>getNumActive() > getMaxTotal() - 3; and</li> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/site/xdoc/mail-lists.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index 905a6e9..dd10315 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -152,7 +152,7 @@ limitations under the License. <td> <strong>Commons Commits List</strong> <br /><br /> - Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> sytem. + Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> system. <br /><br /> </td> <td><a href="mailto:[email protected]";>Subscribe</a></td> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/site/xdoc/release-notes-1.1.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/release-notes-1.1.xml b/src/site/xdoc/release-notes-1.1.xml index 54187f8..5ddd0ea 100644 --- a/src/site/xdoc/release-notes-1.1.xml +++ b/src/site/xdoc/release-notes-1.1.xml @@ -72,7 +72,7 @@ There were a lot changes since the 1.0 release on 12 Aug 2002. <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=12869";>12869</a></td><td>2002-11-01</td><td>Maj</td><td>FIXE</td><td>Abandoned Connections are never closed</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13077";>13077</a></td><td>2002-11-07</td><td>Enh</td><td>FIXE</td><td>Jdbc2PoolDataSource issues</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13129";>13129</a></td><td>2002-11-01</td><td>Nor</td><td>FIXE</td><td>CPDSConnectionFactory prints invalid error messages</td></tr> -<tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13155";>13155</a></td><td>2002-10-30</td><td>Nor</td><td>DUPL</td><td>unexpected "exausted pool" error</td></tr> +<tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13155";>13155</a></td><td>2002-10-30</td><td>Nor</td><td>DUPL</td><td>unexpected "exhausted pool" error</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13235";>13235</a></td><td>2002-11-16</td><td>Blo</td><td>FIXE</td><td>referenced UserPassKey instances get erroneously returned to</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13930";>13930</a></td><td>2003-03-06</td><td>Enh</td><td>FIXE</td><td>Adding connection parameters to BasicDataSourceFactory</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=13988";>13988</a></td><td>2003-03-17</td><td>Enh</td><td>DUPL</td><td>permission error makes connection loop</td></tr> @@ -104,7 +104,7 @@ There were a lot changes since the 1.0 release on 12 Aug 2002. <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=18982";>18982</a></td><td>2003-04-13</td><td>Maj</td><td>INVA</td><td>Binary distribution missing package</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19374";>19374</a></td><td>2003-08-11</td><td>Nor</td><td>FIXE</td><td>Potential for DelegateStatement, DelegateResultSet to be lef</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19614";>19614</a></td><td>2003-08-13</td><td>Maj</td><td>FIXE</td><td>Poor performance under load</td></tr> -<tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19615";>19615</a></td><td>2003-05-02</td><td>Maj</td><td>INVA</td><td>Unecessary global synchronized in AbandonedObjectPool method</td></tr> +<tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19615";>19615</a></td><td>2003-05-02</td><td>Maj</td><td>INVA</td><td>Unnecessary global synchronized in AbandonedObjectPool method</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=19706";>19706</a></td><td>2003-08-26</td><td>Enh</td><td>WONT</td><td>Add Initial Commons Logging to DBCP</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=20649";>20649</a></td><td>2003-08-11</td><td>Cri</td><td>INVA</td><td>deadlock when acquiring connections from a pool</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=21132";>21132</a></td><td>2003-08-11</td><td>Cri</td><td>DUPL</td><td>Broken pipe despite validation query set</td></tr> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/site/xdoc/release-notes-1.2.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/release-notes-1.2.xml b/src/site/xdoc/release-notes-1.2.xml index 8374418..7f8afbd 100644 --- a/src/site/xdoc/release-notes-1.2.xml +++ b/src/site/xdoc/release-notes-1.2.xml @@ -39,7 +39,7 @@ There were some new features were added since the 1.1 release on 20 October 2003 <br/> <li>Refactoring of the DelegatingStatement classes.</li> <br/> -<li>Make some properties dynamic (changeble at runtime), this will be completed in next release.</li> +<li>Make some properties dynamic (changeable at runtime), this will be completed in next release.</li> <br/> <li>Improvements to the prepared statement pooling.</li> <br/> @@ -60,7 +60,7 @@ underlying connection is needed, you have to enable it: PoolingDriver.setAccessT <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25096";>25096</a></td><td>2003-11-30</td><td>Enh</td><td>FIXE</td><td>PoolableConnectionFactory synchronized methods</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25001";>25001</a></td><td>2003-11-30</td><td>Nor</td><td>FIXE</td><td>Oracle 9i and default isolation settings</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25762";>25762</a></td><td>2003-12-26</td><td>Nor</td><td>FIXE</td><td>SharedPoolDataSource getConnection() throws ClassCastException</td></tr> -<tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25067";>25067</a></td><td>2003-12-26</td><td>Nor</td><td>FIXE</td><td>Please give possibility to acecss ObjectPools from PoolingDriver</td></tr> +<tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25067";>25067</a></td><td>2003-12-26</td><td>Nor</td><td>FIXE</td><td>Please give possibility to access ObjectPools from PoolingDriver</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25795";>25795</a></td><td>2003-12-29</td><td>Nor</td><td>DUPL</td><td>NumberFormatException: For input string: "myDB"</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=25794";>25794</a></td><td>2003-12-29</td><td>Nor</td><td>FIXE</td><td>ClassNotFoundException: org.apache.xerces.parsers.SAXParser</td></tr> <tr><td><a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=24966";>24966</a></td><td>2004-01-06</td><td>Nor</td><td>FIXE</td><td>NullPointer with Oracle 9 driver</td></tr> http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java index 7e29ae6..7874f7b 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java +++ b/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java @@ -114,7 +114,7 @@ public class TestAbandonedBasicDataSource extends TestBasicDataSource { assertNotNull(conn2); assertEquals(1, ds.getNumActive()); - // set an IO failure causing the isClosed mathod to fail + // set an IO failure causing the isClosed method to fail final TesterConnection tconn1 = (TesterConnection) ((DelegatingConnection<?>)conn1).getInnermostDelegate(); tconn1.setFailure(new IOException("network error")); final TesterConnection tconn2 = (TesterConnection) ((DelegatingConnection<?>)conn2).getInnermostDelegate(); http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java index 8f5f906..5e766c8 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java +++ b/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java @@ -693,7 +693,7 @@ public abstract class TestConnectionPool { } catch (final SQLException e) { // getWarnings throws an exception if the statement is // closed, but could throw an exception for other reasons - // in this case it is good enought to assume the statement + // in this case it is good enough to assume the statement // is closed return true; } @@ -706,7 +706,7 @@ public abstract class TestConnectionPool { } catch (final SQLException e) { // getWarnings throws an exception if the statement is // closed, but could throw an exception for other reasons - // in this case it is good enought to assume the result set + // in this case it is good enough to assume the result set // is closed return true; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/test/java/org/apache/commons/dbcp2/TestJndi.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestJndi.java b/src/test/java/org/apache/commons/dbcp2/TestJndi.java index 97c28f8..9554797 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestJndi.java +++ b/src/test/java/org/apache/commons/dbcp2/TestJndi.java @@ -52,7 +52,7 @@ public class TestJndi { protected Context context = null; /** - * Test BasicDatsource bind and lookup + * Test BasicDatasource bind and lookup * * @throws Exception */ http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/7dd3b68c/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java index f6b57b3..12d6087 100644 --- a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java +++ b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java @@ -199,7 +199,7 @@ public class TestPStmtPoolingBasicDataSource extends TestBasicDataSource { } @Test - public void testPStmtPoolingAccrossClose() throws Exception { + public void testPStmtPoolingAcrossClose() throws Exception { ds.setMaxTotal(1); // only one connection in pool needed ds.setMaxIdle(1); ds.setAccessToUnderlyingConnectionAllowed(true);
