[OpenSRF-GIT] OpenSRF branch master updated. ff62eb3409f5d36a76a3f73611ade803d015bf21

Evergreen Git git at git.evergreen-ils.org
Thu Mar 15 21:39:08 EDT 2012


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 "OpenSRF".

The branch, master has been updated
       via  ff62eb3409f5d36a76a3f73611ade803d015bf21 (commit)
      from  4319d23a331fadd5bd515d4a78154cc829d13981 (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 ff62eb3409f5d36a76a3f73611ade803d015bf21
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Mar 14 11:38:18 2012 -0400

    Prevent undef warnings on perl socket read nbytes test
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Dan Scott <dan at coffeecode.net>

diff --git a/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm b/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
index b8a5da1..b68e418 100644
--- a/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
+++ b/src/perl/lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm
@@ -226,7 +226,7 @@ sub wait {
         $first_read = 0;
     }
 
-    if ($nbytes == 0 and $first_read) {
+    if ($first_read and defined $nbytes and $nbytes == 0) {
         # if the first read on an active socket is 0 bytes, 
         # the socket has been disconnected from the remote end. 
         $logger->error("Disconnected from Jabber server");

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

Summary of changes:
 .../lib/OpenSRF/Transport/SlimJabber/XMPPReader.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OpenSRF


More information about the opensrf-commits mailing list