X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FBlockRunner.pm;h=be29701060422bfead3f5c361032a7471e4480b8;hb=b58ec618e9efcae245aed37529738180c551db91;hp=286266998206fe93685d982becabd7783e1c8837;hpb=ceb5f4120b53e71772d8158215e0644961b1a92c;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Storage/BlockRunner.pm b/lib/DBIx/Class/Storage/BlockRunner.pm
index 2862669..be29701 100644
--- a/lib/DBIx/Class/Storage/BlockRunner.pm
+++ b/lib/DBIx/Class/Storage/BlockRunner.pm
@@ -188,12 +188,7 @@ sub _run {
           # FIXME - we assume that $storage->{_dbh_autocommit} is there if
           # txn_init_depth is there, but this is a DBI-ism
           $txn_init_depth > ( $storage->{_dbh_autocommit} ? 0 : 1 )
-        )
-          or
-        ! do {
-          local $self->storage->{_in_do_block_retry_handler} = 1;
-          $self->retry_handler->($self)
-        }
+        ) or ! $self->retry_handler->($self)
       );
 
       # we got that far - let's retry