svn commit: r1385378 - in /zookeeper/trunk: CHANGES.txt src/c/src/zookeeper.c

[mi...@apache.org]

Author: michim
Date: Sun Sep 16 21:31:30 2012
New Revision: 1385378

URL: http://svn.apache.org/viewvc?rev=1385378&view=rev
Log:
Revert 1380931: ZOOKEEPER-1105 c client zookeeper_close not send CLOSE_OP
request to server (lincoln.lee via michim)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/c/src/zookeeper.c

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1385378&r1=1385377&r2=1385378&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun Sep 16 21:31:30 2012
@@ -234,9 +234,6 @@ BUGFIXES:
   ZOOKEEPER-1328. Misplaced assertion for the test case 'FLELostMessageTest'
   and not identifying misfunctions. (Rakesh R via mahadev)
 
-  ZOOKEEPER-1105 c client zookeeper_close not send CLOSE_OP request to server
-  (lincoln.lee via michim)
-
   ZOOKEEPER-1380. zkperl: _zk_release_watch doesn't remove items properly from
   the watch list. (Botond Hejj via mahadev)
 

Modified: zookeeper/trunk/src/c/src/zookeeper.c
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/src/zookeeper.c?rev=1385378&r1=1385377&r2=1385378&view=diff
==============================================================================
--- zookeeper/trunk/src/c/src/zookeeper.c (original)
+++ zookeeper/trunk/src/c/src/zookeeper.c Sun Sep 16 21:31:30 2012
@@ -2521,22 +2521,6 @@ int zookeeper_close(zhandle_t *zh)
         /* make sure the close request is sent; we set timeout to an arbitrary
          * (but reasonable) number of milliseconds since we want the call to block*/
         rc=adaptor_send_queue(zh, 3000);
-
-        /* make sure server has read the close request and sent back a response*/ 
-        struct pollfd fd_s[1];
-        fd_s[0].fd = zh->fd;
-        fd_s[0].events = POLLIN;
-        int ret = poll(fd_s, 1, 1000);
-        if (ret == 0) {
-            LOG_WARN(("Timeout when waitting for server's reply after sending a close request, sessionId=%#llx\n",
-                zh->client_id.client_id));
-        } else if (ret < 0) {
-            LOG_WARN(("System error happens when waitting for server's reply, sessionId=%#llx\n",
-                zh->client_id.client_id));
-        } else {
-            // do nothing
-        }
-
     }else{
         LOG_INFO(("Freeing zookeeper resources for sessionId=%#llx\n",
                 zh->client_id.client_id));