From f85fa2c21daf24ad434fa26083e5dd45e4706198 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 20 Mar 2014 20:14:14 +1300
Subject: [PATCH] Fix for #79 - Rollback in case of connection closed -
 deactivate() not called when connection.rollback() fails

---
 .../ebeaninternal/server/transaction/JdbcTransaction.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java
index 5213554ed..f066668f4 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -634,12 +634,13 @@ public class JdbcTransaction implements SpiTransaction {
     try {
       connection.rollback();
 
+    } catch (Exception ex) {
+      throw new PersistenceException(ex);
+      
+    } finally {
       // these will not throw an exception
       deactivate();
       notifyRollback(cause);
-
-    } catch (Exception ex) {
-      throw new PersistenceException(ex);
     }
   }