TransactionListenerのロールバック処理を修正

EC-CUBE · Jul 21, 2022 · dbb5442 · dbb5442
1 parent 11db57d
commit dbb5442
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Eccube/EventListener/TransactionListener.php b/src/Eccube/EventListener/TransactionListener.php
@@ -103,8 +103,10 @@ public function onKernelException(ExceptionEvent $event)
             return;
         }
 
-        if ($this->em->getConnection()->isTransactionActive()) {
-            $this->em->rollback();
+        if ($this->em->getConnection()->getNativeConnection()->inTransaction()) {
+            if ($this->em->getConnection()->isRollbackOnly()) {
+                $this->em->rollback();
+            }
             log_debug('Rollback executed.');
         } else {
             log_debug('Transaction is not active. Rollback skipped.');
@@ -123,7 +125,7 @@ public function onKernelTerminate(TerminateEvent $event)
 
             return;
         }
-        if ($this->em->getConnection()->isTransactionActive()) {
+        if ($this->em->getConnection()->getNativeConnection()->inTransaction()) {
             if ($this->em->getConnection()->isRollbackOnly()) {
                 $this->em->rollback();
                 log_debug('Rollback executed.');