From 636a148509c3b8f4dc96d23b99b80d9729f56b9d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sat, 15 Mar 2014 12:45:44 +1300 Subject: [PATCH] Fix for #79 - Rollback in case of connection closed --- .../ebeaninternal/server/core/BeanRequest.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java b/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java index f3378df7b..4ebc84e89 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java @@ -2,6 +2,11 @@ package com.avaje.ebeaninternal.server.core; import java.sql.Connection; +import javax.persistence.PersistenceException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.avaje.ebean.EbeanServer; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.api.SpiTransaction; @@ -11,6 +16,8 @@ import com.avaje.ebeaninternal.api.SpiTransaction; */ public abstract class BeanRequest { + private static final Logger log = LoggerFactory.getLogger(BeanRequest.class); + /** * The server processing the request. */ @@ -84,7 +91,14 @@ public abstract class BeanRequest { */ public void rollbackTransIfRequired() { if (createdTransaction) { - transaction.rollback(); + try { + transaction.rollback(); + } catch (PersistenceException e) { + // Just log this and carry on. A previous exception has been + // thrown and if this rollback throws exception it likely means + // that the connection is broken (and the datasource and db will cleanup) + log.error("Error trying to rollack a transaction (after a prior exception thrown)", e); + } } }