You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/01/13 17:24:58 UTC
[commons-dbcp] branch master updated: [DBCP-569] Fix test random
failure on TestSynchronizationOrder.testInterposedSynchronization (#84)
(#84)
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 f36c6fe [DBCP-569] Fix test random failure on TestSynchronizationOrder.testInterposedSynchronization (#84) (#84)
f36c6fe is described below
commit f36c6feb34316198df840279bd80758e0475f1c0
Author: Florent Guillaume <fg...@nuxeo.com>
AuthorDate: Wed Jan 13 18:24:51 2021 +0100
[DBCP-569] Fix test random failure on TestSynchronizationOrder.testInterposedSynchronization (#84) (#84)
---
src/changes/changes.xml | 3 ++
.../dbcp2/managed/TestSynchronizationOrder.java | 34 ++++++++++++----------
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 04ff862..30a673a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -89,6 +89,9 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="DBCP-567" dev="ggregory" type="update" due-to="Phil Steitz, Gary Gregory, Phil Steitz, Romain Manni-Bucau">
Use abort rather than close to clean up abandoned connections.
</action>
+ <action dev="ggregory" type="update" issue="DBCP-569" due-to="Florent Guillaume">
+ Fix test random failure on TestSynchronizationOrder.testInterposedSynchronization #84.
+ </action>
</release>
<release version="2.8.0" date="2020-09-21" description="This is a minor release, including bug fixes and enhancements.">
<!-- add -->
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
index 9e840f4..8797b2b 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -135,24 +135,11 @@ public class TestSynchronizationOrder {
public void setup() {
transactionManager = new TransactionManager() {
- @Override
- public void begin() throws NotSupportedException, SystemException {
-
- }
+ private Transaction transaction;
@Override
- public void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException {
-
- }
-
- @Override
- public int getStatus() throws SystemException {
- return 0;
- }
-
- @Override
- public Transaction getTransaction() throws SystemException {
- return new Transaction() {
+ public void begin() throws NotSupportedException, SystemException {
+ transaction = new Transaction() {
@Override
public void commit() throws HeuristicMixedException, HeuristicRollbackException, RollbackException, SecurityException, SystemException {
@@ -193,6 +180,21 @@ public class TestSynchronizationOrder {
}
@Override
+ public void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException {
+
+ }
+
+ @Override
+ public int getStatus() throws SystemException {
+ return 0;
+ }
+
+ @Override
+ public Transaction getTransaction() throws SystemException {
+ return transaction;
+ }
+
+ @Override
public void resume(final Transaction transaction) throws IllegalStateException, InvalidTransactionException, SystemException {
}