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

[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  f86dc5e760d2f4477b8157ed5b23a48662fff0f2 (commit)
      from  42dc80ef7e60929bb53dead5105bff63586c6b79 (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 f86dc5e760d2f4477b8157ed5b23a48662fff0f2
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Feb 26 14:33:58 2013 -0500

    Repair clear holds shelf transaction timeout
    
    Initiate our cstore transaction after making the initial, potentially
    long-running call to collect the clear-shelf holds to process.
    Otherwise, the cstore transaction may time out while waiting on the
    holds retrieval to complete.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    
    Conflicts:
    	Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 3f9c2e9..393c0e1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -3386,7 +3386,7 @@ __PACKAGE__->register_method(
 sub clear_shelf_process {
 	my($self, $client, $auth, $org_id, $match_copy) = @_;
 
-	my $e = new_editor(authtoken=>$auth, xact => 1);
+	my $e = new_editor(authtoken=>$auth);
 	$e->checkauth or return $e->die_event;
 	my $cache = OpenSRF::Utils::Cache->new('global');
 
@@ -3399,6 +3399,8 @@ sub clear_shelf_process {
         "open-ils.circ.captured_holds.id_list.expired_on_shelf.retrieve"
     )->run($auth, $org_id, $match_copy);
 
+    $e->xact_begin;
+
     my @holds;
     my @canceled_holds; # newly canceled holds
     my $chunk_size = 25; # chunked status updates

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS