roll back xact in set_item_lost when copy is alrady marked lost and we exit the sub...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@19123 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm
index 75f96e6..b2dffc5 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/AssetCommon.pm
@@ -457,7 +457,7 @@ sub set_item_lost {
 
     $e->allowed('SET_CIRC_LOST', $circ->circ_lib) or return $e->die_event;
 
-    return OpenILS::Event->new('COPY_MARKED_LOST')
+    return $e->die_event(OpenILS::Event->new('COPY_MARKED_LOST'))
            if $copy->status == OILS_COPY_STATUS_LOST;
 
     # ---------------------------------------------------------------------

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
index 9845623..ff298f4 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
@@ -149,8 +149,10 @@ sub event {
 # -----------------------------------------------------------------------------
 sub die_event {
        my $self = shift;
+    my $evt = shift;
        $self->rollback;
     $self->died(1);
+    $self->event($evt);
        return $self->event;
 }