X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FClassData.pm;h=3882ccd4da4eca0bd47fa290468b1445399a1423;hb=74c89dead3cfd8e95cbe853adbc6fe9eed539f4e;hp=76cdbeced4310fea45d7827c1b15ac4948bf4fe5;hpb=843c92335c9a365347740342df6f8d3506486432;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 76cdbec..3882ccd 100644
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -2,6 +2,7 @@ package Catalyst::ClassData;
 
 use Moose::Role;
 use Class::MOP;
+use Class::MOP::Object;
 use Scalar::Util 'blessed';
 
 sub mk_classdata {
@@ -11,19 +12,28 @@ sub mk_classdata {
 
   my $slot = '$'.$attribute;
   my $accessor =  sub {
-    my $meta = $_[0]->meta;
-    if(@_ > 1){
+    my $pkg = ref $_[0] || $_[0];
+    my $meta = $pkg->Class::MOP::Object::meta();
+    if (@_ > 1){
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];
     }
 
-    if( $meta->has_package_symbol($slot) ){
-      return ${ $meta->get_package_symbol($slot) };
+    # tighter version of
+    # if ( $meta->has_package_symbol($slot) ) {
+    #   return ${ $meta->get_package_symbol($slot) };
+    # }
+    no strict 'refs';
+    my $v = *{"${pkg}::${attribute}"}{SCALAR};
+    if (defined ${$v}) {
+     return ${$v};
     } else {
       foreach my $super ( $meta->linearized_isa ) {
-        my $super_meta = Moose::Meta::Class->initialize($super);
-        if( $super_meta->has_package_symbol($slot) ){
-          return ${ $super_meta->get_package_symbol($slot) };
+        # tighter version of same after
+        # my $super_meta = Moose::Meta::Class->initialize($super);
+        my $v = ${"${super}::"}{$attribute} ? *{"${super}::${attribute}"}{SCALAR} : undef;
+        if (defined ${$v}) {
+          return ${$v};
         }
       }
     }
@@ -33,7 +43,7 @@ sub mk_classdata {
   confess("Failed to create accessor: $@ ")
     unless ref $accessor eq 'CODE';
 
-  my $meta = $class->meta;
+  my $meta = $class->Class::MOP::Object::meta();
   my $immutable_options;
   if( $meta->is_immutable ){
     $immutable_options = $meta->get_immutable_options;