protecting against failed refetching of a canceled hold

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6559 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 1a27fa0..a6f615e 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
@@ -142,7 +142,7 @@ sub complete_reshelving {
                            FROM        $cp cp 
                                        LEFT JOIN $circ circ ON (circ.target_copy = cp.id AND circ.id IS NULL)
                            WHERE       cp.status = 7
-                                       AND cp.create_date > NOW() - CAST(? AS INTERVAL)
+                                       AND cp.create_date < NOW() - CAST(? AS INTERVAL)
                        )
        SQL
 
@@ -746,7 +746,7 @@ sub new_hold_copy_targeter {
                try {
                        #first, re-fetch the hold, to make sure it's not captured already
                        $hold = action::hold_request->retrieve( $hold->id );
-                       die "OK\n" if ($hold->capture_time);
+                       die "OK\n" if (!$hold or $hold->capture_time);
 
                        #start a transaction if needed
                        if ($self->method_lookup('open-ils.storage.transaction.current')->run) {