[Jifty-commit] r4731 - in Jifty-DBI/trunk: lib/Jifty/DBI

[jifty-commit at lists.jifty.org]

Author: sartak
Date: Mon Dec 17 15:30:35 2007
New Revision: 4731

Modified:
   Jifty-DBI/trunk/   (props changed)
   Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm

Log:
 r49172 at onn:  sartak | 2007-12-17 15:30:17 -0500
 We were leaking the collection on set_page_info. Yuck! We need some way to find these Scalar::Defer leaks


Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	(original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm	Mon Dec 17 15:30:35 2007
@@ -3,6 +3,7 @@
 use warnings;
 use strict;
 use Scalar::Defer qw/lazy/;
+use Scalar::Util qw/weaken/;
 
 =head1 NAME
 
@@ -1747,7 +1748,10 @@
     );
     return if $self->derived;
 
-    $self->pager->total_entries( lazy { $self->count_all } )
+    my $weakself = $self;
+    weaken($weakself);
+
+    $self->pager->total_entries( lazy { $weakself->count_all } )
         ->entries_per_page( $args{'per_page'} )
         ->current_page( $args{'current_page'} );