From 9d747d6d0d76d401f6d226ccf4701cdbd2812905 Mon Sep 17 00:00:00 2001
From: Parziphal <blackmesa@ubuntu-server.com>
Date: Fri, 18 Oct 2013 20:20:29 -0500
Subject: [PATCH] nighty

---
 .../ActionController/Exception/DoubleRenderException.php | 4 ++--
 lib/Rails/ActiveRecord/Connection.php                    | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/Rails/ActionController/Exception/DoubleRenderException.php b/lib/Rails/ActionController/Exception/DoubleRenderException.php
index fc7bd9e..99ce586 100755
--- a/lib/Rails/ActionController/Exception/DoubleRenderException.php
+++ b/lib/Rails/ActionController/Exception/DoubleRenderException.php
@@ -1,7 +1,7 @@
 <?php
 namespace Rails\ActionController\Exception;
 
-class DoubleRenderException extends Rails\Exception\LogicException implements ExceptionInterface
+class DoubleRenderException extends \Rails\Exception\LogicException implements ExceptionInterface
 {
     protected $title = 'Double Render Error';
-}
\ No newline at end of file
+}
diff --git a/lib/Rails/ActiveRecord/Connection.php b/lib/Rails/ActiveRecord/Connection.php
index b89bd26..fa5225c 100755
--- a/lib/Rails/ActiveRecord/Connection.php
+++ b/lib/Rails/ActiveRecord/Connection.php
@@ -203,8 +203,13 @@ class Connection
             $block = $params;
         }
         $this->resource()->beginTransaction();
-        $block();
-        $this->resource()->commit();
+        try {
+            $block();
+            $this->resource()->commit();
+        } catch (\Exception $e) {
+            $this->resource()->rollBack();
+            throw $e;
+        }
     }
     
     public function resource()