Fix a code typo

[gitmo/Moose.git] / lib / Moose / Object.pm

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index 0d2aa9c..afcd693 100644 (file)
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -9,7 +9,7 @@ use Scalar::Util;
 use if ( not our $__mx_is_compiled ), 'Moose::Meta::Class';
 use if ( not our $__mx_is_compiled ), metaclass => 'Moose::Meta::Class';
 
-our $VERSION   = '0.73';
+our $VERSION   = '0.74';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -55,12 +55,21 @@ sub BUILDALL {
 }
 
 sub DEMOLISHALL {
-    my $self = shift;    
-    # NOTE: we ask Perl if we even 
+    my $self = shift;
+
+    # NOTE: we ask Perl if we even
     # need to do this first, to avoid
-    # extra meta level calls    
+    # extra meta level calls
     return unless $self->can('DEMOLISH');
-    foreach my $method (Class::MOP::class_of($self)->find_all_methods_by_name('DEMOLISH')) {
+
+    # This is a hack, because Moose::Meta::Class may not be the right
+    # metaclass, but class_of may return undef during global
+    # destruction, if the metaclass object has already been cleaned
+    # up.
+    my $meta = Class::MOP::class_of($self)
+        || Moose::Meta::Class->initialize( ref $self );
+
+    foreach my $method ( $meta->find_all_methods_by_name('DEMOLISH') ) {
         $method->{code}->execute($self);
     }
 }