X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FClassAttribute%2FTrait%2FRole%2FComposite.pm;h=5d4d0003297532262ae42e8d53747883a1980f1d;hb=8863e904edfcb6155db122c3334190a59ba81595;hp=deaef101de231fd71bbb0627ee792354437d1ec1;hpb=3f4cecde2f263efcb13a918650bd5a7c4afcf4d1;p=gitmo%2FMooseX-ClassAttribute.git

diff --git a/lib/MooseX/ClassAttribute/Trait/Role/Composite.pm b/lib/MooseX/ClassAttribute/Trait/Role/Composite.pm
index deaef10..5d4d000 100644
--- a/lib/MooseX/ClassAttribute/Trait/Role/Composite.pm
+++ b/lib/MooseX/ClassAttribute/Trait/Role/Composite.pm
@@ -35,7 +35,7 @@ sub _merge_class_attributes {
             Moose->throw_error( "Role '"
                     . $self->name()
                     . "' has encountered a class attribute conflict "
-                    . "during composition. This is fatal error and cannot be disambiguated."
+                    . "during composition. This is a fatal error and cannot be disambiguated."
             );
         }
 
@@ -53,8 +53,10 @@ around apply_params => sub {
     my $orig = shift;
     my $self = shift;
 
-    my $metarole = Moose::Util::MetaRole::apply_metaroles(
-        for            => $self->$orig(@_),
+    $self->$orig(@_);
+
+    $self = Moose::Util::MetaRole::apply_metaroles(
+        for            => $self,
         role_metaroles => {
             application_to_class =>
                 ['MooseX::ClassAttribute::Trait::Application::ToClass'],
@@ -63,9 +65,9 @@ around apply_params => sub {
         },
     );
 
-    $metarole->_merge_class_attributes();
+    $self->_merge_class_attributes();
 
-    return $metarole;
+    return $self;
 };
 
 1;