Releng, test fixes, bug fixes for Session plugins

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 3ba6dd1..518d807 100644 (file)
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -36,6 +36,8 @@ sub finalize {
 sub prepare_cookies {
     my $c = shift;
 
+    my $ret = $c->NEXT::prepare_cookies(@_);
+
        my $cookie_name = $c->config->{session}{cookie_name};
 
     if ( my $cookie = $c->request->cookies->{$cookie_name} ) {
@@ -44,7 +46,7 @@ sub prepare_cookies {
         $c->log->debug(qq/Found sessionid "$sid" in cookie/) if $c->debug;
     }
 
-    $c->NEXT::prepare_cookies(@_);
+       return $ret;
 }
 
 __PACKAGE__

diff --git a/t/01use.t b/t/01use.t
index 09d7023..dd9d90c 100644 (file)
--- a/t/01use.t
+++ b/t/01use.t
@@ -1,4 +1,4 @@
 use strict;
 use Test::More tests => 1;
 
-BEGIN { use_ok('Catalyst::Plugin::Session::FastMmap') }
+BEGIN { use_ok('Catalyst::Plugin::Session::State::Cookie') }