X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FCursor.pm;fp=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FCursor.pm;h=6fdfdf9e4705484fa3f3c15c5e95a0758b98c1c8;hb=d63c9e6418251a745cc6b6e1ef5ddf4b12ceb190;hp=58b5dcff9a8814f544a548f74866b7f7ed2253de;hpb=90a8030442ff2b9b6414ec9d8d7119b28d36426c;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Cursor.pm b/lib/DBIx/Class/Storage/DBI/Cursor.pm index 58b5dcf..6fdfdf9 100644 --- a/lib/DBIx/Class/Storage/DBI/Cursor.pm +++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm @@ -8,6 +8,7 @@ use base 'DBIx::Class::Cursor'; use Try::Tiny; use Scalar::Util qw(refaddr weaken); use List::Util 'shuffle'; +use DBIx::Class::_Util 'detected_reinvoked_destructor'; use namespace::clean; __PACKAGE__->mk_group_accessors('simple' => @@ -233,6 +234,8 @@ sub reset { sub DESTROY { + return if &detected_reinvoked_destructor; + $_[0]->__finish_sth if $_[0]->{sth}; }