When applying roles, don't apply the exact same role object more than once.

[gitmo/Moose.git] / lib / Moose / Meta / Role / Application / ToRole.pm

diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index 21091d6..54979f5 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -6,13 +6,17 @@ use metaclass;
 
 use Scalar::Util    'blessed';
 
-our $AUTHORITY = 'cpan:STEVAN';
-
 use base 'Moose::Meta::Role::Application';
 
 sub apply {
     my ($self, $role1, $role2) = @_;
+
+    # We're not checking for role names to support multiple instances of the
+    # same Parameterized role.
+    return if grep { $role1 == $_ } @{ $role2->get_roles() };
+
     $self->SUPER::apply($role1, $role2);
+
     $role2->add_role($role1);
 }
 
@@ -25,7 +29,7 @@ sub check_role_exclusions {
     foreach my $excluded_role_name ($role1->get_excluded_roles_list) {
         if ( $role2->does_role($excluded_role_name) ) {
             require Moose;
-            Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'");
+            Moose->throw_error("The role " . $role2->name . " does the excluded role '$excluded_role_name'");
         }
         $role2->add_excluded_roles($excluded_role_name);
     }