[open-ils-commits] [GIT] Evergreen ILS branch master updated. dae5f2a1f1057ed4fdd83ca1b861ca2864fe6b45

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  dae5f2a1f1057ed4fdd83ca1b861ca2864fe6b45 (commit)
      from  14956259a3c5f23c2255de3f0c33533555f4d80d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dae5f2a1f1057ed4fdd83ca1b861ca2864fe6b45
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Wed Jul 24 10:02:08 2013 -0400

    Fix error on deleted hold in transit
    
    May be caused by purging holds combined with "Checkout fills related hold"
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index ff50ed3..e01bbc9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -3271,14 +3271,21 @@ sub process_received_transit {
     if($hold_transit) { 
         my $hold = $self->editor->retrieve_action_hold_request($hold_transit->hold);
 
-        # hold has arrived at destination, set shelf time
-        $self->put_hold_on_shelf($hold);
-        $self->bail_on_events($self->editor->event)
-            unless $self->editor->update_action_hold_request($hold);
-        return if $self->bail_out;
+        if ($hold) {
+            # hold has arrived at destination, set shelf time
+            $self->put_hold_on_shelf($hold);
+            $self->bail_on_events($self->editor->event)
+                unless $self->editor->update_action_hold_request($hold);
+            return if $self->bail_out;
 
-        $self->notify_hold($hold_transit->hold);
-        $ishold = 1;
+            $self->notify_hold($hold_transit->hold);
+            $ishold = 1;
+        } else {
+            $hold_transit = undef;
+            $self->cancelled_hold_transit(1);
+            $self->reshelve_copy(1);
+            $self->fake_hold_dest(0);
+        }
     }
 
     $self->push_events( 

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/Application/Circ/Circulate.pm      |   21 +++++++++++++------
 1 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Evergreen ILS