X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FObject.pm;h=d176a1f74d890d379de03831ad05d2de6c3ba350;hb=460cd14ecfb30a599884bb7dffbcdcdca9e7c432;hp=a80640cadadddbac6917e4dc3a5ba613f42a3d15;hpb=5fd2cf413e611047a3b8d667378a258a7955941e;p=kivitendo-erp.git

diff --git a/SL/DB/Object.pm b/SL/DB/Object.pm
index a80640cad..d176a1f74 100755
--- a/SL/DB/Object.pm
+++ b/SL/DB/Object.pm
@@ -2,6 +2,7 @@ package SL::DB::Object;
 
 use strict;
 
+use English qw(-no_match_vars);
 use Rose::DB::Object;
 use List::MoreUtils qw(any);
 
@@ -111,28 +112,44 @@ sub load {
 sub save {
   my ($self, @args) = @_;
 
-  my $result;
+  my ($result, $exception);
   my $worker = sub {
     SL::DB::Object::Hooks::run_hooks($self, 'before_save');
-    $result = $self->SUPER::save(@args);
+    $exception = $EVAL_ERROR unless eval {
+      $result = $self->SUPER::save(@args);
+      1;
+    };
     SL::DB::Object::Hooks::run_hooks($self, 'after_save', $result);
+
+    return $result;
   };
 
   $self->db->in_transaction ? $worker->() : $self->db->do_transaction($worker);
+
+  die $exception if $exception;
+
   return $result;
 }
 
 sub delete {
   my ($self, @args) = @_;
 
-  my $result;
+  my ($result, $exception);
   my $worker = sub {
     SL::DB::Object::Hooks::run_hooks($self, 'before_delete');
-    $result = $self->SUPER::delete(@args);
+    $exception = $EVAL_ERROR unless eval {
+      $result = $self->SUPER::delete(@args);
+      1;
+    };
     SL::DB::Object::Hooks::run_hooks($self, 'after_delete', $result);
+
+    return $result;
   };
 
   $self->db->in_transaction ? $worker->() : $self->db->do_transaction($worker);
+
+  die $exception if $exception;
+
   return $result;
 }