From 64bf6d6a3592ef60d621aed2ce54491eef5c13c2 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Thu, 5 Oct 2017 00:04:12 +0200
Subject: [PATCH] commit transaction only if active (#1156)

---
 src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 71242c64b..939aed95f 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -288,7 +288,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
    */
   @Override
   public void endTransIfRequired() {
-    if (createdTransaction) {
+    if (createdTransaction && transaction.isActive()) {
       transaction.commit();
     }
   }