Fixed minor problem with txn scope guard - rollback exceptions were never reported

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / TxnScopeGuard.pm

diff --git a/lib/DBIx/Class/Storage/TxnScopeGuard.pm b/lib/DBIx/Class/Storage/TxnScopeGuard.pm
index 1c2a070..53ff96c 100644 (file)
--- a/lib/DBIx/Class/Storage/TxnScopeGuard.pm
+++ b/lib/DBIx/Class/Storage/TxnScopeGuard.pm
@@ -25,19 +25,19 @@ sub DESTROY {
 
   my $exception = $@;
   Carp::cluck("A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error - bad")
-    unless $exception; 
+    unless $exception;
+
+  my $rollback_exception;
   {
     local $@;
     eval { $storage->txn_rollback };
-    my $rollback_exception = $@;
-    if($rollback_exception) {
-      my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION";
-
-      $storage->throw_exception(
-        "Transaction aborted: ${exception}. "
+    $rollback_exception = $@;
+  }
+  if ($rollback_exception && $rollback_exception !~ /DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION/) {
+    $storage->throw_exception(
+        "Transaction aborted: ${exception} "
         . "Rollback failed: ${rollback_exception}"
-      ) unless $rollback_exception =~ /$exception_class/;
-    }
+    );
   }
 }