[Jifty-commit] jifty branch, master, updated. jifty-1.10228-5-g2543ba9

[Jifty commits]

The branch, master has been updated
       via  2543ba9a0d75a008dc24c1f84692fa0ce1d0c0da (commit)
      from  d149993d123cb222fb495776493614124b00d6dc (commit)

Summary of changes:
 lib/Jifty/Handler.pm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 2543ba9a0d75a008dc24c1f84692fa0ce1d0c0da
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Apr 5 22:24:25 2011 -0400

    setup_view_handlers is essentially idempotent; ensure that we only run it once

diff --git a/lib/Jifty/Handler.pm b/lib/Jifty/Handler.pm
index 09bcd45..af7bb9b 100644
--- a/lib/Jifty/Handler.pm
+++ b/lib/Jifty/Handler.pm
@@ -94,6 +94,8 @@ Initialize all of our view handlers.
 sub setup_view_handlers {
     my $self = shift;
 
+    return if $self->_view_handlers;
+
     $self->_view_handlers({});
     foreach my $class ($self->view_handlers()) {
         $self->_view_handlers->{$class} =  $class->new();
@@ -109,7 +111,7 @@ Returns the Jifty view handler for C<ClassName>.
 sub view {
     my $self = shift;
     my $class = shift;
-    $self->setup_view_handlers unless $self->_view_handlers;
+    $self->setup_view_handlers;
     return $self->_view_handlers->{$class};
 }
 
@@ -213,7 +215,7 @@ sub handle_request {
     my $req = Plack::Request->new($env);
     my $response;
 
-    $self->setup_view_handlers() unless $self->_view_handlers;
+    $self->setup_view_handlers;
 
     $self->call_trigger('before_request', $req);
 

-----------------------------------------------------------------------