X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=d72441ea6951430a3d646e16697deb8225d3e798;hb=fb34eb9c063c53abd061d260a30f0ca7c57a0833;hp=53bf7957ac7dfb5c0cc4b995b57009a7a3c4579b;hpb=7d7519a4bbd079da53bf50f4822cabb0e3af74a1;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm
index 53bf795..d72441e 100644
--- a/lib/Catalyst/Utils.pm
+++ b/lib/Catalyst/Utils.pm
@@ -1,7 +1,6 @@
 package Catalyst::Utils;
 
 use strict;
-use Catalyst::Exception;
 use File::Spec;
 use HTTP::Request;
 use Path::Class;
@@ -140,6 +139,13 @@ sub class2tempdir {
         eval { $tmpdir->mkpath };
 
         if ($@) {
+            # don't load Catalyst::Exception as a BEGIN in Utils,
+            # because Utils often gets loaded before MyApp.pm, and if
+            # Catalyst::Exception is loaded before MyApp.pm, it does
+            # not honor setting
+            # $Catalyst::Exception::CATALYST_EXCEPTION_CLASS in
+            # MyApp.pm
+            require Catalyst::Exception;
             Catalyst::Exception->throw(
                 message => qq/Couldn't create tmpdir '$tmpdir', "$@"/ );
         }