[open-ils-commits] r13262 - trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2009-05-29 14:05:29 -0400 (Fri, 29 May 2009)
New Revision: 13262

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
Log:
be more strict about going away after short-circut code; check earlier for hold validity

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2009-05-29 18:04:21 UTC (rev 13261)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2009-05-29 18:05:29 UTC (rev 13262)
@@ -884,6 +884,8 @@
 			$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);
@@ -892,10 +894,9 @@
 				my $ex_time = $parser->parse_datetime( clense_ISO8601( $hold->expire_time ) );
 				$hold->update( { cancel_cause => 1, 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