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

[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  c6f486fd1bce40f722b2072cef69e59ac6df678b (commit)
      from  82b16fc7bb93d31cfa9ff30c0614139666bafaf3 (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 c6f486fd1bce40f722b2072cef69e59ac6df678b
Author: Dan Scott <dscott at laurentian.ca>
Date:   Tue Sep 6 13:53:02 2016 -0400

    LP#1620750 Prevent log warning for uninit var in checkin_retarget()
    
    If the retarget_mode variable is not initialized, then a warning is generated
    in the logs every time an item is checked in. Avoid the warning by
    short-circuiting before testing the value in the regex.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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 d142df6..8daab0c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -2229,7 +2229,7 @@ sub check_transit_checkin_interval {
 # Retarget local holds at checkin
 sub checkin_retarget {
     my $self = shift;
-    return unless $self->retarget_mode =~ m/retarget/; # Retargeting?
+    return unless $self->retarget_mode and $self->retarget_mode =~ m/retarget/; # Retargeting?
     return unless $self->is_checkin; # Renewals need not be checked
     return if $self->capture eq 'nocapture'; # Not capturing holds anyway? Move on.
     return if $self->is_precat; # No holds for precats

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

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


hooks/post-receive
-- 
Evergreen ILS