[Rt-commit] r7959 - in rt/branches/3.7-EXPERIMENTAL-RTIR-2.4: lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Tue May 29 19:42:36 2007
New Revision: 7959

Modified:
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/   (props changed)
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Scrip_Overlay.pm

Log:
 r4636 at cubic-pc (orig r7084):  ruz | 2007-02-27 01:03:04 +0300
 * don't cache object to avoid memory leaks due to circular references


Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Scrip_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Scrip_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Scrip_Overlay.pm	Tue May 29 19:42:36 2007
@@ -281,22 +281,16 @@
 
 =head2 ConditionObj
 
-Retuns an RT::ScripCondition object with this Scrip's IsApplicable
+Retuns an L<RT::ScripCondition> object with this Scrip's IsApplicable
 
 =cut
 
 sub ConditionObj {
     my $self = shift;
 
-    unless ( defined $self->{'ScripConditionObj'} ) {
-        require RT::ScripCondition;
-        $self->{'ScripConditionObj'} =
-          RT::ScripCondition->new( $self->CurrentUser );
-        if ( $self->ScripCondition ) {
-            $self->{'ScripConditionObj'}->Load( $self->ScripCondition );
-        }
-    }
-    return ( $self->{'ScripConditionObj'} );
+    my $res = RT::ScripCondition->new( $self->CurrentUser );
+    $res->Load( $self->ScripCondition );
+    return $res;
 }
 
 # }}}
@@ -443,6 +437,7 @@
             }
 	}
     };
+
     if ($@) {
         $RT::Logger->error( "Scrip IsApplicable " . $self->Id . " died. - " . $@ );
         return (undef);