X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FException.pm;h=c8d55479618b1083df0839789465f58bad03ce7f;hb=2efad04b4d6590ecf00566d698e94622198909aa;hp=b5b5bc330fdf39f292492100e04f7f44a381df6b;hpb=ccf2a6da7ec998260d1e6737badd4faf661b0ad6;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Exception.pm b/lib/Catalyst/Exception.pm
index b5b5bc3..c8d5547 100644
--- a/lib/Catalyst/Exception.pm
+++ b/lib/Catalyst/Exception.pm
@@ -35,8 +35,9 @@ Throws a fatal exception.
 =cut
 
 has message => (
-    is  => 'ro',
-    isa => 'Str',
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { $! || '' },
 );
 
 use overload
@@ -48,16 +49,29 @@ sub as_string {
     return $self->message;
 }
 
-sub throw {
-    my $class  = shift;
-    my %params = @_ == 1 ? ( error => $_[0] ) : @_;
+around BUILDARGS => sub {
+    my ($next, $class, @args) = @_;
+    if (@args == 1 && !ref $args[0]) {
+        @args = (message => $args[0]);
+    }
+
+    my $args = $class->$next(@args);
+    $args->{message} ||= $args->{error}
+        if exists $args->{error};
 
-    $params{message} = $params{message} || $params{error} || $! || '';
-    my $error = $class->new(%params);
+    return $args;
+};
 
+sub throw {
+    my $class = shift;
+    my $error = $class->new(@_);
     local $Carp::CarpLevel = 1;
+    croak $error;
+}
 
-    croak($error);
+sub rethrow {
+    my ($self) = @_;
+    croak $self;
 }
 
 =head2 meta