From c4e0d7aedcb46bf6715db74b8f521d82a9a22f93 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 6 Aug 2015 05:31:55 +1200 Subject: [PATCH] Internal - BeanRequest.rollbackTransIfRequired() ... change catch from PersistenceException -> Exception #371 --- .../com/avaje/ebeaninternal/server/core/BeanRequest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 1cd3054c7..23da4ce10 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java @@ -6,8 +6,6 @@ import com.avaje.ebeaninternal.api.SpiTransaction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.PersistenceException; - /** * Base class for find and persist requests. */ @@ -66,11 +64,11 @@ public abstract class BeanRequest { if (createdTransaction) { try { transaction.rollback(); - } catch (PersistenceException e) { + } catch (Exception 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); + log.error("Error trying to rollback a transaction (after a prior exception thrown)", e); } } }