be more strict about going away after short-circut code; check earlier for hold validity

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
index 8068e45..45bebdd 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
@@ -875,6 +875,8 @@ sub new_hold_copy_targeter {
                        $hold->remove_from_object_index();
                        $hold = action::hold_request->retrieve( $hold->id );
 
+                       die "OK\n" if (!$hold or $hold->capture_time or $hold->cancel_time);
+
                        # remove old auto-targeting maps
                        my @oldmaps = action::hold_copy_map->search( hold => $hold->id );
                        $_->delete for (@oldmaps);
@@ -883,10 +885,9 @@ sub new_hold_copy_targeter {
                                my $ex_time = $parser->parse_datetime( clense_ISO8601( $hold->expire_time ) );
                                $hold->update( { cancel_time => 'now' } ) if ( DateTime->compare($ex_time, DateTime->now) < 0 );
                                $self->method_lookup('open-ils.storage.transaction.commit')->run;
+                               die "OK\n";
                        }
 
-                       die "OK\n" if (!$hold or $hold->capture_time or $hold->cancel_time);
-
                        my $all_copies = [];
 
                        # find filters for MR holds