X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FComponentised.pm;h=2b3bf83d5071c3550ddc1568d581937ae7482034;hb=096f421241;hp=5841afa09898b94d776b3a78a8ad1999cfb61728;hpb=9d3d92abe4fefa68f63ba4c90eb60f9e899911d4;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm index 5841afa..2b3bf83 100644 --- a/lib/DBIx/Class/Componentised.pm +++ b/lib/DBIx/Class/Componentised.pm @@ -6,6 +6,7 @@ use warnings; use Class::C3; use Class::Inspector; +use Carp::Clan qw/DBIx::Class/; sub inject_base { my ($class, $target, @to_inject) = @_; @@ -71,7 +72,13 @@ sub ensure_class_loaded { my ($class, $f_class) = @_; return if Class::Inspector->loaded($f_class); eval "require $f_class"; # require needs a bareword or filename - $class->throw_exception($@) if ($@); + if ($@) { + if ($class->can('throw_exception')) { + $class->throw_exception($@); + } else { + croak $@; + } + } } # Returns true if the specified class is installed or already loaded, false