From: Tomas Doran <bobtfish@bobtfish.net>
Date: Tue, 25 Oct 2011 00:52:48 +0000 (-0700)
Subject: Move prepare_action call into try block
X-Git-Tag: 5.90007~8^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=676bed72afa0c79b9f26e1d548a49dbfb6ea15c7;hp=942572d7cd0a89d54b12ddd89de16ddcd19ca077

Move prepare_action call into try block
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index a3d8f9e..28ec0eb 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2015,6 +2015,7 @@ sub prepare {
                 $c->prepare_body;
             }
         }
+        $c->prepare_action;
     }
     # VERY ugly and probably shouldn't rely on ->finalize actually working
     catch {
@@ -2026,15 +2027,8 @@ sub prepare {
         die $_;
     };
 
-    my $method  = $c->req->method  || '';
-    my $path    = $c->req->path;
-    $path       = '/' unless length $path;
-    my $address = $c->req->address || '';
-
     $c->log_request;
 
-    $c->prepare_action;
-
     return $c;
 }