handle uninitialized attributes correctly

stevan · Mar 11, 2012 · 8c94d8f · 8c94d8f
1 parent 2c758b6
commit 8c94d8f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/mop/class.pm b/lib/mop/class.pm
@@ -24,7 +24,12 @@ sub new {
         if ( my $attrs = $class->get_all_attributes ) {
             foreach my $attr ( keys %$attrs ) {
                 my ($plain_attr) = ($attr =~ /^\$(.*)/);
-                $instance->{ $attr } = \(exists $args{ $plain_attr } ? $args{ $plain_attr } : $attrs->{ $attr }->());
+                if ( exists $args{ $plain_attr } ) {
+                    $instance->{ $attr } = \($args{ $plain_attr });
+                }
+                else {
+                    $instance->{ $attr } = \(ref $attrs->{ $attr } ? $attrs->{ $attr }->() : $attrs->{ $attr });
+                }
             }
         }
         $class->bless( $instance );