[Bps-public-commit] Path-Dispatcher branch, pass-match, updated. a26160dd83700a59e4c5388e69db5ed327e39c81

[Shawn Moore]

The branch, pass-match has been updated
       via  a26160dd83700a59e4c5388e69db5ed327e39c81 (commit)
      from  4a660e060ea38509440c6b6cdb55d71e6dd35f74 (commit)

Summary of changes:
 lib/Path/Dispatcher/Dispatch.pm |    2 +-
 lib/Path/Dispatcher/Match.pm    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit a26160dd83700a59e4c5388e69db5ed327e39c81
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Sun Oct 10 10:32:45 2010 -0400

    Enforce scalar context at the Match level not Dispatch

diff --git a/lib/Path/Dispatcher/Dispatch.pm b/lib/Path/Dispatcher/Dispatch.pm
index 62fa29b..54e56db 100644
--- a/lib/Path/Dispatcher/Dispatch.pm
+++ b/lib/Path/Dispatcher/Dispatch.pm
@@ -40,7 +40,7 @@ sub run {
             $match->rule->trace(running => 1, match => $match)
                 if $ENV{PATH_DISPATCHER_TRACE};
 
-            push @results, scalar $match->run(@args);
+            push @results, $match->run(@args);
 
             die "Path::Dispatcher abort\n";
         };
diff --git a/lib/Path/Dispatcher/Match.pm b/lib/Path/Dispatcher/Match.pm
index 49df4cd..7ade7ca 100644
--- a/lib/Path/Dispatcher/Match.pm
+++ b/lib/Path/Dispatcher/Match.pm
@@ -37,7 +37,7 @@ sub run {
     my $self = shift;
 
     local $_ = $self->path;
-    return $self->rule->run($self, @_);
+    return scalar $self->rule->run($self, @_);
 }
 
 sub pos {

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