File tree Expand file tree Collapse file tree 1 file changed +8
-12
lines changed
hibernate-core/src/main/java/org/hibernate/internal Expand file tree Collapse file tree 1 file changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -644,19 +644,15 @@ protected void pulseTransactionCoordinator() {
644644 @ Override
645645 public void joinTransaction () {
646646 checkOpen ();
647- if ( !transactionCoordinator .getTransactionCoordinatorBuilder ().isJta () ) {
648- log .callingJoinTransactionOnNonJtaEntityManager ();
647+ try {
648+ // For a non-JTA TransactionCoordinator, this just logs a WARNing
649+ transactionCoordinator .explicitJoin ();
649650 }
650- else {
651- try {
652- transactionCoordinator .explicitJoin ();
653- }
654- catch ( TransactionRequiredForJoinException e ) {
655- throw new TransactionRequiredException ( e .getMessage () );
656- }
657- catch ( HibernateException he ) {
658- throw getExceptionConverter ().convert ( he );
659- }
651+ catch ( TransactionRequiredForJoinException e ) {
652+ throw new TransactionRequiredException ( e .getMessage () );
653+ }
654+ catch ( HibernateException he ) {
655+ throw getExceptionConverter ().convert ( he );
660656 }
661657 }
662658
You can’t perform that action at this time.
0 commit comments