X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=36b05236f47514b294e258be5d7352d6df328b5d;hb=74c89dead3cfd8e95cbe853adbc6fe9eed539f4e;hp=176769c97fe75495b6b1c9e7d68a9b674bf883e4;hpb=2f3812528068bc1d9f7840067f0c03d36cd47e6d;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 176769c..36b0523 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -2,8 +2,10 @@ package Catalyst::Component;
 
 use Moose;
 use Class::MOP;
+use Class::MOP::Object;
 use MooseX::Adopt::Class::Accessor::Fast;
 use Catalyst::Utils;
+use Class::C3::Adopt::NEXT;
 use MRO::Compat;
 use mro 'c3';
 
@@ -68,8 +70,6 @@ sub BUILDARGS {
     return $args;
 }
 
-no Moose;
-
 sub COMPONENT {
     my ( $self, $c ) = @_;
 
@@ -98,8 +98,8 @@ sub config {
         # work in a subclass. If we don't have the package symbol in the
         # current class we know we need to copy up to ours, which calling
         # the setter will do for us.
-
-        unless ($self->meta->has_package_symbol('$_config')) {
+        my $meta = $self->Class::MOP::Object::meta();
+        unless ($meta->has_package_symbol('$_config')) {
 
             $config = $self->merge_config_hashes( $config, {} );
             $self->_config( $config );
@@ -120,6 +120,7 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
+no Moose;
 
 __PACKAGE__->meta->make_immutable;
 1;