This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
The following commit(s) were added to refs/heads/master by this push: new d73cae3b Use preferred spelling for "cannot" d73cae3b is described below commit d73cae3b70f5d9c6df5bd8e76b4cc07e82b2248d Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Nov 5 07:03:01 2024 -0500 Use preferred spelling for "cannot" --- .../apache/commons/dbcp2/managed/LocalXAConnectionFactory.java | 2 +- .../org/apache/commons/dbcp2/managed/ManagedConnection.java | 10 +++++----- .../commons/dbcp2/managed/TestConnectionWithNarayana.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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 e69b9880..248c5cff 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java @@ -211,7 +211,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory { } /** - * Always returns a zero length Xid array. The LocalXAConnectionFactory can not support recovery, so no xids + * Always returns a zero length Xid array. The LocalXAConnectionFactory cannot support recovery, so no xids * will ever be found. * * @param flag 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 3108dc87..a5a72d1a 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java @@ -122,7 +122,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio @Override public void commit() throws SQLException { if (transactionContext != null) { - throw new SQLException("Commit can not be set while enrolled in a transaction"); + throw new SQLException("Commit cannot be set while enrolled in a transaction"); } super.commit(); } @@ -179,7 +179,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio @Override public void rollback() throws SQLException { if (transactionContext != null) { - throw new SQLException("Commit can not be set while enrolled in a transaction"); + throw new SQLException("Commit cannot be set while enrolled in a transaction"); } super.rollback(); } @@ -187,7 +187,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio @Override public void setAutoCommit(final boolean autoCommit) throws SQLException { if (transactionContext != null) { - throw new SQLException("Auto-commit can not be set while enrolled in a transaction"); + throw new SQLException("Auto-commit cannot be set while enrolled in a transaction"); } super.setAutoCommit(autoCommit); } @@ -195,7 +195,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio @Override public void setReadOnly(final boolean readOnly) throws SQLException { if (transactionContext != null) { - throw new SQLException("Read-only can not be set while enrolled in a transaction"); + throw new SQLException("Read-only cannot be set while enrolled in a transaction"); } super.setReadOnly(readOnly); } @@ -244,7 +244,7 @@ public class ManagedConnection<C extends Connection> extends DelegatingConnectio if (transactionContext != null && !transactionContext.isTransactionComplete()) { if (transactionContext.isActive()) { if (transactionContext != transactionRegistry.getActiveTransactionContext()) { - throw new SQLException("Connection can not be used while enlisted in another transaction"); + throw new SQLException("Connection cannot be used while enlisted in another transaction"); } return; } diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java index dcf9c50b..f560cbd0 100644 --- a/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java +++ b/src/test/java/org/apache/commons/dbcp2/managed/TestConnectionWithNarayana.java @@ -119,7 +119,7 @@ public class TestConnectionWithNarayana { fail("Should not work after timeout"); } catch (final SQLException e) { // Expected - Assertions.assertEquals("Commit can not be set while enrolled in a transaction", e.getMessage()); + Assertions.assertEquals("Commit cannot be set while enrolled in a transaction", e.getMessage()); } mds.getTransactionManager().rollback(); }