Merge 'trunk' into 'replication_dedux'

[dbsrgits/DBIx-Class-Historic.git] / lib / DBIx / Class / Storage / DBI / Replicated.pm

diff --git a/lib/DBIx/Class/Storage/DBI/Replicated.pm b/lib/DBIx/Class/Storage/DBI/Replicated.pm
index efabb05..0846f85 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Replicated.pm
+++ b/lib/DBIx/Class/Storage/DBI/Replicated.pm
@@ -428,7 +428,7 @@ sub execute_reliably {
     };
     
     ##Reset to the original state
-    $self->schema->storage->read_handler($current); 
+    $self->read_handler($current); 
     
     ##Exception testing has to come last, otherwise you might leave the 
     ##read_handler set to master.
@@ -492,8 +492,8 @@ the master storage.
 
 around 'reload_row' => sub {
        my ($reload_row, $self, $row) = @_;
-       $self->execute_reliably(sub {
-               $self->$reload_row(shift);
+       return $self->execute_reliably(sub {
+               return $self->$reload_row(shift);
        }, $row);
 };