[Bps-public-commit] Path-Dispatcher branch, master, updated. 78b0b10849c2ee077c0ba734314238fccac64389

[sartak at bestpractical.com]

The branch, master has been updated
       via  78b0b10849c2ee077c0ba734314238fccac64389 (commit)
      from  9e77dcd44efec02fe84b15781cc9f77cd2b73d72 (commit)

Summary of changes:
 lib/Path/Dispatcher/Builder.pm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 78b0b10849c2ee077c0ba734314238fccac64389
Author: Shawn M Moore <sartak at gmail.com>
Date:   Fri Mar 6 22:49:13 2009 -0500

    Don't stomp on any rule's existing name

diff --git a/lib/Path/Dispatcher/Builder.pm b/lib/Path/Dispatcher/Builder.pm
index 531b23f..6821ef5 100644
--- a/lib/Path/Dispatcher/Builder.pm
+++ b/lib/Path/Dispatcher/Builder.pm
@@ -221,15 +221,17 @@ sub _add_rule {
                           ? "(" . $UNDER_RULE->name . " - rule $rule_name)"
                           : "(anonymous Under - rule $rule_name)";
 
-            $rule->name($full_name);
+            $rule->name($full_name) unless $rule->has_name;
         }
         else {
             $self->dispatcher->add_rule($rule);
-            $rule->name("(" . $self->dispatcher->name . " - rule $rule_name)");
+            $rule->name("(" . $self->dispatcher->name . " - rule $rule_name)")
+                unless $rule->has_name;
         }
     }
     else {
-        $rule->name($rule_name);
+        $rule->name($rule_name)
+            unless $rule->has_name;
         return $rule, @_;
     }
 }

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