From: Robert Buels <rmb32@cornell.edu>
Date: Wed, 10 Feb 2010 23:38:49 +0000 (-0800)
Subject: load_first_existing_class and load_class now die if the file is found but the class... 
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=35a175a2c47851b151b3fc211564b764595c5d57;p=gitmo%2FClass-MOP.git

load_first_existing_class and load_class now die if the file is found but the class is missing or empty
---

diff --git a/lib/Class/MOP.pm b/lib/Class/MOP.pm
index d79c0ac..d7bc993 100644
--- a/lib/Class/MOP.pm
+++ b/lib/Class/MOP.pm
@@ -1,4 +1,3 @@
-
 package Class::MOP;
 
 use strict;
@@ -88,31 +87,36 @@ sub load_first_existing_class {
         }
     }
 
-    my $found;
-    my %exceptions;
-
+    my $file_loaded;
     for my $class (@classes) {
-        my $file = _class_to_pmfile($class);
 
         return $class if is_class_loaded($class);;
 
-        return $class if try {
-            local $SIG{__DIE__};
-            require $file;
-            return 1;
-        }
-        catch {
-            unless (/^Can't locate \Q$file\E in \@INC/) {
-                confess "Couldn't load class ($class) because: $_";
-            }
+        my $file = _class_to_pmfile($class);
 
-            return;
-        };
+	$file_loaded =
+	    try {
+		local $SIG{__DIE__};
+		require $file;
+		return [$class, $file];
+	    }
+	    catch {
+		unless (/^Can't locate \Q$file\E in \@INC/) {
+		    confess "Couldn't load class ($class) because: $_";
+		}
+		return;
+	    };
+
+        return $class if $file_loaded && is_class_loaded($class);
     }
 
-    if ( @classes > 1 ) {
+    if( $file_loaded ) {
+	confess "$file_loaded->[0] is empty or missing in file $file_loaded->[1]";
+    }
+    elsif ( @classes > 1 ) {
         confess "Can't locate any of @classes in \@INC (\@INC contains: @INC).";
-    } else {
+    }
+    else {
         confess "Can't locate " . _class_to_pmfile($classes[0]) . " in \@INC (\@INC contains: @INC).";
     }
 }