From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 11 Jun 2015 12:49:21 +0000 (-0400)
Subject: LP#902255: Correct "ILS Event at check in" logic
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0af32677611f8b81531dee95f96487a96b328659;p=working%2FEvergreen.git

LP#902255: Correct "ILS Event at check in" logic

In a classic case of "fix a bug to reveal another" it turn out that
there was a small logic bug hiding in the check in hold-capture code.
The result of this bug was that the wrong ILS Event object was being
returned when we ran into the double-scan hold-capture situation by
overwriting the correct one immediately after we construct it, which
in turn prevented the previous commit from working as designed.

We now return the correct ILS Event immediately so that we can
properly detect the situation.  Two birds with one branch.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
index c2893241b4..d1a935e4bb 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
@@ -847,13 +847,13 @@ sub runmethod {
             my $evt = OpenILS::Event->new(
                 'DATABASE_UPDATE_FAILED', payload => $arg, debug => "$err" );
             $self->event($evt);
+            return undef;
         }
 
         if( $err ) {
             $self->event( 
                 OpenILS::Event->new( 'DATABASE_QUERY_FAILED', 
                     payload => $arg, debug => "$err" ));
-            return undef;
         }
 
         return undef;