From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 13 Jul 2009 13:31:48 +0000 (+0000)
Subject: capture the timeout argument to json_query
X-Git-Tag: sprint4-merge-nov22~9699
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=08c7542bced8ed7ca69394c4747630cf2b664110;p=working%2FEvergreen.git

capture the timeout argument to json_query

git-svn-id: svn://svn.open-ils.org/ILS/trunk@13567 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
index df479741dc..dbfc384558 100644
--- a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
@@ -813,6 +813,8 @@ sub json_query {
 	my @arg = ( ref($arg) eq 'ARRAY' ) ? @$arg : ($arg);
     my $method = $self->app.'.json_query.atomic';
     $method =~ s/\.atomic$//o if $self->substream($$options{substream} || 0);
+
+    $self->timeout($$options{timeout});
 	$self->clear_event;
     my $obj;
     my $err;