DB-Object-Hooks: bei Exception in Hook auch Objekttyp in Exception-Text aufnehmen

diff --git a/SL/DB/Object/Hooks.pm b/SL/DB/Object/Hooks.pm
index 3839286ba141f50a702cac9f346fda513970de80..371e4450e4198133ccdd7990664d37aa5c72b04a 100644 (file)
--- a/SL/DB/Object/Hooks.pm
+++ b/SL/DB/Object/Hooks.pm
@@ -44,9 +44,10 @@ sub run_hooks {
 
   foreach my $sub (@{ ( $hooks{$when} || { })->{ ref($object) } || [ ] }) {
     my $result = ref($sub) eq 'CODE' ? $sub->($object, @args) : $object->call_sub($sub, @args);
 
   foreach my $sub (@{ ( $hooks{$when} || { })->{ ref($object) } || [ ] }) {
     my $result = ref($sub) eq 'CODE' ? $sub->($object, @args) : $object->call_sub($sub, @args);

-    die SL::X::DBHookError->new(when   => $when,
-                                hook   => (ref($sub) eq 'CODE' ? '<anonymous sub>' : $sub),
-                                object => $object)
+    die SL::X::DBHookError->new(when        => $when,
+                                hook        => (ref($sub) eq 'CODE' ? '<anonymous sub>' : $sub),
+                                object      => $object,
+                                object_type => ref($object))

       if !$result;
   }
 }
       if !$result;
   }
 }

diff --git a/SL/X.pm b/SL/X.pm
index 0f206949bb34f03e5f68f08e727985533c105bcd..552e5ef29a0e3976f4f58a6dc5227d2a0cd51469 100644 (file)
--- a/SL/X.pm
+++ b/SL/X.pm
@@ -5,6 +5,6 @@ use strict;
 use Exception::Lite qw(declareExceptionClass);
 
 declareExceptionClass('SL::X::FormError');
 use Exception::Lite qw(declareExceptionClass);
 
 declareExceptionClass('SL::X::FormError');

-declareExceptionClass('SL::X::DBHookError', [ '%s hook \'%s\' failed', qw(when hook object) ]);
+declareExceptionClass('SL::X::DBHookError', [ '%s hook \'%s\' for object type \'%s\' failed', qw(when hook object_type object) ]);

 
 1;
 
 1;