[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 71bfa4a091225ccb13892d3c2a19c2cf729dfd5a

[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, rel_2_2 has been updated
       via  71bfa4a091225ccb13892d3c2a19c2cf729dfd5a (commit)
      from  b613dd946f58610e268925c25c65eed413836ef6 (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 71bfa4a091225ccb13892d3c2a19c2cf729dfd5a
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Aug 3 15:08:51 2012 -0400

    SIP re-login fetches correct auth session
    
    After a login session expires and the SIP server logs in again to
    acquire a new authtoken, be sure to use the new authtoken when fetching
    the new session object.  Otherwise, the login_session is left undef and
    you may see errors like this when checking in items:
    
    Can't call method "ws_ou" on an undefined value at
    /usr/local/share/perl/5.10.1/OpenILS/SIP/Transaction/Checkin.pm line 77.
    
    Incidentally, the checkin code is the only code that references
    $sip_handler->{login_session}.  And the problem listed above only occurs
    when the login session expires just prior to a checkin call.  In any
    other scenario, the login_session would ultimately get repaired.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
index 4774174..c7dad96 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP.pm
@@ -229,9 +229,11 @@ sub login {
 	my $key = $response->{payload}->{authtoken};
 	syslog('LOG_INFO', "OILS: Login succeeded for $username : authkey = $key");
 
+    $self->{authtoken} = $key;
+
     $self->fetch_session; # to cache the login
 
-	return $self->{authtoken} = $key;
+    return $key;
 }
 
 

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

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/SIP.pm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS