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

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 76cdbec..154062a 100644
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -12,18 +12,27 @@ sub mk_classdata {
   my $slot = '$'.$attribute;
   my $accessor =  sub {
     my $meta = $_[0]->meta;
+    my $pkg = ref $_[0] || $_[0];
     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}"}{SCALAR};
+        if (defined ${$v}) {
+          return ${$v};
         }
       }
     }