X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FTxnScopeGuard.pm;h=a9228c104781bbea130711051231cb1297587b8c;hb=c6e27318d1a83b7474eaea616d47d478746609f2;hp=53ff96c0027601278a360969bc795d98e4ab27c3;hpb=d7ded411cdeee27c550335d900c630a2e5989d0b;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Storage/TxnScopeGuard.pm b/lib/DBIx/Class/Storage/TxnScopeGuard.pm
index 53ff96c..a9228c1 100644
--- a/lib/DBIx/Class/Storage/TxnScopeGuard.pm
+++ b/lib/DBIx/Class/Storage/TxnScopeGuard.pm
@@ -2,7 +2,7 @@ package DBIx::Class::Storage::TxnScopeGuard;
 
 use strict;
 use warnings;
-use Carp ();
+use Carp::Clan qw/^DBIx::Class/;
 
 sub new {
   my ($class, $storage) = @_;
@@ -24,7 +24,8 @@ sub DESTROY {
   return if $dismiss;
 
   my $exception = $@;
-  Carp::cluck("A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error - bad")
+
+  carp 'A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error - bad'
     unless $exception;
 
   my $rollback_exception;
@@ -33,11 +34,15 @@ sub DESTROY {
     eval { $storage->txn_rollback };
     $rollback_exception = $@;
   }
+
   if ($rollback_exception && $rollback_exception !~ /DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION/) {
-    $storage->throw_exception(
-        "Transaction aborted: ${exception} "
-        . "Rollback failed: ${rollback_exception}"
-    );
+    if ($exception) {
+      $@ = "Transaction aborted: ${exception} "
+          ."Rollback failed: ${rollback_exception}";
+    }
+    else {
+      carp "Rollback failed: ${rollback_exception}";
+    }
   }
 }