Merge remote-tracking branch 'rikbrown/devel' into devel

PerlDancer · Dec 25, 2012 · 2293ba3 · 2293ba3
2 parents ae8426c + 991d100
commit 2293ba3
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/Dancer/Error.pm b/lib/Dancer/Error.pm
@@ -3,6 +3,7 @@ package Dancer::Error;
 use strict;
 use warnings;
 use Carp;
+use Scalar::Util qw(blessed);
 
 use base 'Dancer::Object';
 
@@ -206,8 +207,15 @@ sub _render_serialized {
 
     my $message =
       !ref $self->message ? {error => $self->message} : $self->message;
-    ref $message eq 'HASH' && defined $self->exception
-      and $message->{exception} = $self->exception;
+
+    if (ref $message eq 'HASH' && defined $self->exception) {
+        if (blessed($self->exception)) {
+            $message->{exception} = ref($self->exception);
+            $message->{exception} =~ s/^Dancer::Exception:://;
+        } else {
+            $message->{exception} = $self->exception;
+        }
+    }
 
     if (setting('show_errors')) {
         Dancer::Response->new(