[Jifty-commit] r6716 - jifty/trunk/lib/Jifty/Action

[Jifty commits]

Author: alexmv
Date: Mon Mar 30 23:14:35 2009
New Revision: 6716

Modified:
   jifty/trunk/lib/Jifty/Action/Record.pm

Log:
Fix a bug introduced in r6713; 'return' means we never cached record_class

Modified: jifty/trunk/lib/Jifty/Action/Record.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Action/Record.pm	(original)
+++ jifty/trunk/lib/Jifty/Action/Record.pm	Mon Mar 30 23:14:35 2009
@@ -58,10 +58,10 @@
     my $self = shift;
     return $self->{record_class} ||= do {
         my $class = ref($self);
+        my $model;
         if ($class =~ /::(Create|Search|Execute|Update|Delete)([^:]+)$/) {
-            my($type, $model) = ($1, $2);
-            $model = Jifty->app_class( Model => $model );
-            return $model if grep {$_ eq $model} Jifty->class_loader->models;
+            $model = Jifty->app_class( Model => $2 );
+            undef $model unless grep {$_ eq $model} Jifty->class_loader->models;
         }
 
         if ($class eq "Jifty::Action::Record") {
@@ -69,6 +69,7 @@
         } else {
             $self->log->fatal("Cannot determine model for Jifty::Action::Record subclass $class");
         }
+        $model
     };
 }