Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6F57B10993 for ; Wed, 11 Sep 2013 22:27:16 +0000 (UTC) Received: (qmail 70327 invoked by uid 500); 11 Sep 2013 22:27:16 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 70309 invoked by uid 500); 11 Sep 2013 22:27:16 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 70301 invoked by uid 99); 11 Sep 2013 22:27:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 22:27:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Sep 2013 22:27:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E3D2123888D7; Wed, 11 Sep 2013 22:26:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1522079 - /zookeeper/trunk/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java Date: Wed, 11 Sep 2013 22:26:52 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130911222652.E3D2123888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Wed Sep 11 22:26:52 2013 New Revision: 1522079 URL: http://svn.apache.org/r1522079 Log: ZOOKEEPER-1750 Handle NIOServerCnxn#toString returning null (Rakesh R via michim) Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java?rev=1522079&r1=1522078&r2=1522079&view=diff ============================================================================== --- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java (original) +++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java Wed Sep 11 22:26:52 2013 @@ -27,8 +27,12 @@ import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.test.ClientBase; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NIOServerCnxnTest extends ClientBase { + private static final Logger LOG = LoggerFactory + .getLogger(NIOServerCnxnTest.class); /** * Test operations on ServerCnxn after socket closure. @@ -52,10 +56,14 @@ public class NIOServerCnxnTest extends C serverFactory instanceof NIOServerCnxnFactory); Iterable connections = serverFactory.getConnections(); for (ServerCnxn serverCnxn : connections) { - String cnxnStr = serverCnxn.toString(); serverCnxn.close(); - Assert.assertEquals("Connection mismatches!", cnxnStr, - serverCnxn.toString()); + try { + serverCnxn.toString(); + } catch (Exception e) { + LOG.error("Exception while getting connection details!", e); + Assert.fail("Shouldn't throw exception while " + + "getting connection details!"); + } } } finally { zk.close();