[Catalyst-commits] r11168 - in Catalyst-Runtime/5.80/trunk: lib/Catalyst/DispatchType t

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-08-19 20:21:44 +0000 (Wed, 19 Aug 2009)
New Revision: 11168

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm
   Catalyst-Runtime/5.80/trunk/t/custom_exception_class_simple.t
Log:
Back out r11057 which breaks one of the chained tests, whilst not fixing the bug in question

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm	2009-08-19 19:10:06 UTC (rev 11167)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm	2009-08-19 20:21:44 UTC (rev 11168)
@@ -235,10 +235,8 @@
                     local $c->req->{arguments} = [ @{$c->req->args}, @parts ];
                     next TRY_ACTION unless $action->match($c);
                 }
+                my $args_attr = $action->attributes->{Args}->[0];
 
-                # Default args is blank, not 0, since Args()
-                my $args_attr = $action->attributes->{Args}->[0] || '';
-
                 #    No best action currently
                 # OR This one matches with fewer parts left than the current best action,
                 #    And therefore is a better match

Modified: Catalyst-Runtime/5.80/trunk/t/custom_exception_class_simple.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/custom_exception_class_simple.t	2009-08-19 19:10:06 UTC (rev 11167)
+++ Catalyst-Runtime/5.80/trunk/t/custom_exception_class_simple.t	2009-08-19 20:21:44 UTC (rev 11168)
@@ -7,9 +7,12 @@
 use Test::More tests => 1;
 use Test::Exception;
 
+TODO: {
+    local $TODO = 'Does not work yet';
+
 lives_ok {
     require TestAppClassExceptionSimpleTest;
 } 'Can load application';
 
-1;
+}