Attachment 25102 Details for Bug 11701 – Bug 11701: Fix C4::Context::Zconn

[patch] Bug 11701: Fix C4::Context::Zconn

Bug-11701-Fix-C4ContextZconn.patch (text/plain), 1.92 KB, created by Julian Maurice on 2014-02-06 16:16:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2014-02-06 16:16:01 UTC

Size: 1.92 KB

patch

obsolete

>From cb3d26f99c5cea178d201b52898cef23cd46b6da Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 13 Nov 2013 14:21:40 +0100
>Subject: [PATCH] Bug 11701: Fix C4::Context::Zconn
>
>---
> C4/Context.pm |   12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/C4/Context.pm b/C4/Context.pm
>index 3914420..f61bf14 100644
>--- a/C4/Context.pm
>+++ b/C4/Context.pm
>@@ -693,8 +693,8 @@ sub Zconn {
>     my $auth=shift;
>     my $piggyback=shift;
>     my $syntax=shift;
>-    if ( defined($context->{"Zconn"}->{$server}) && (0 == $context->{"Zconn"}->{$server}->errcode()) ) {
>-        return $context->{"Zconn"}->{$server};
>+    if ( defined($context->{"Zconn"}->{$server}->{$async}) && (0 == $context->{"Zconn"}->{$server}->{$async}->errcode()) ) {
>+        return $context->{"Zconn"}->{$server}->{$async};
>     # No connection object or it died. Create one.
>     }else {
>         # release resources if we're closing a connection and making a new one
>@@ -703,12 +703,12 @@ sub Zconn {
>         # and make a new one, particularly for a batch job.  However, at
>         # first glance it does not look like there's a way to easily check
>         # the basic health of a ZOOM::Connection
>-        $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
>+        $context->{"Zconn"}->{$server}->{$async}->destroy() if defined($context->{"Zconn"}->{$server}->{$async});
> 
>-        $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
>-        $context->{ Zconn }->{ $server }->option(
>+        $context->{"Zconn"}->{$server}->{$async} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
>+        $context->{ Zconn }->{ $server }->{$async}->option(
>             preferredRecordSyntax => C4::Context->preference("marcflavour") );
>-        return $context->{"Zconn"}->{$server};
>+        return $context->{"Zconn"}->{$server}->{$async};
>     }
> }
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11701: 25101 | 25102 | 25439 | 26328 | 26329 | 26361 | 26362 | 26506 | 26507