From a47e8fb986d9873f31c6e69b9ed3ba7ee0b549f7 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 14 Aug 2006 16:45:20 +0000 Subject: [PATCH] moved hold-reset to after xact commit to prevent xact clobbering git-svn-id: svn://svn.open-ils.org/ILS/trunk@5492 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Circ/Transit.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Transit.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Transit.pm index 9b3edb1bcc..f937be4df7 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Transit.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Transit.pm @@ -225,6 +225,11 @@ sub abort_transit { my $holdtransit = $e->retrieve_action_hold_transit_copy($transit->id); + return $e->event unless $e->delete_action_transit_copy($transit); + return $e->event unless $e->update_asset_copy($copy); + + $e->commit; + # if this is a hold transit, un-capture/un-target the hold if($holdtransit) { $hold = $e->retrieve_action_hold_request($holdtransit->hold) @@ -233,10 +238,6 @@ sub abort_transit { return $evt if $evt; } - return $e->event unless $e->delete_action_transit_copy($transit); - return $e->event unless $e->update_asset_copy($copy); - - $e->commit; return 1; } -- 2.11.0