From cc2c1ecfb501f2cbd119b29dd218ecd50fd8d74d Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Thu, 11 Jun 2015 08:49:21 -0400 Subject: [PATCH] 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 Signed-off-by: Kathy Lussier Signed-off-by: Jason Stephenson --- Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.11.0