File tree Expand file tree Collapse file tree 2 files changed +9
-1
lines changed
main/java/org/hibernate/resource/transaction/backend/jdbc/internal
test/java/org/hibernate/test/resource/transaction/jdbc Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -230,7 +230,7 @@ public void rollback() {
230
230
231
231
@ Override
232
232
public TransactionStatus getStatus () {
233
- return jdbcResourceTransaction .getStatus ();
233
+ return rollbackOnly ? TransactionStatus . MARKED_ROLLBACK : jdbcResourceTransaction .getStatus ();
234
234
}
235
235
236
236
@ Override
Original file line number Diff line number Diff line change 10
10
import org .hibernate .resource .transaction .TransactionCoordinator ;
11
11
import org .hibernate .resource .transaction .TransactionCoordinatorBuilder ;
12
12
import org .hibernate .resource .transaction .backend .jdbc .internal .JdbcResourceLocalTransactionCoordinatorBuilderImpl ;
13
+ import org .hibernate .resource .transaction .spi .TransactionStatus ;
13
14
14
15
import org .hibernate .test .resource .common .SynchronizationCollectorImpl ;
15
16
import org .junit .Test ;
@@ -69,14 +70,21 @@ public boolean shouldAutoJoinTransaction() {
69
70
}
70
71
);
71
72
73
+ assertEquals ( TransactionStatus .NOT_ACTIVE , transactionCoordinator .getTransactionDriverControl ().getStatus () );
74
+
72
75
transactionCoordinator .getTransactionDriverControl ().begin ();
76
+ assertEquals ( TransactionStatus .ACTIVE , transactionCoordinator .getTransactionDriverControl ().getStatus () );
77
+
73
78
transactionCoordinator .getTransactionDriverControl ().markRollbackOnly ();
79
+ assertEquals ( TransactionStatus .MARKED_ROLLBACK , transactionCoordinator .getTransactionDriverControl ().getStatus () );
80
+
74
81
try {
75
82
transactionCoordinator .getTransactionDriverControl ().commit ();
76
83
}
77
84
catch (TransactionException expected ) {
78
85
}
79
86
finally {
87
+ assertEquals ( TransactionStatus .MARKED_ROLLBACK , transactionCoordinator .getTransactionDriverControl ().getStatus () );
80
88
transactionCoordinator .getTransactionDriverControl ().rollback ();
81
89
}
82
90
}
You can’t perform that action at this time.
0 commit comments