Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 45200 invoked from network); 26 Jan 2010 03:11:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Jan 2010 03:11:46 -0000 Received: (qmail 32933 invoked by uid 500); 26 Jan 2010 03:11:46 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 32894 invoked by uid 500); 26 Jan 2010 03:11:45 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 32882 invoked by uid 99); 26 Jan 2010 03:11:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jan 2010 03:11:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 26 Jan 2010 03:11:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2F83523889B8; Tue, 26 Jan 2010 03:11:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r903063 - in /hadoop/zookeeper/trunk: CHANGES.txt src/c/src/zk_adaptor.h src/c/src/zk_hashtable.c src/c/src/zookeeper.c Date: Tue, 26 Jan 2010 03:11:21 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100126031121.2F83523889B8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Tue Jan 26 03:11:19 2010 New Revision: 903063 URL: http://svn.apache.org/viewvc?rev=903063&view=rev Log: ZOOKEEPER-495. c client logs an invalid error when zookeeper_init is called with chroot (phunt via mahadev) Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/c/src/zk_adaptor.h hadoop/zookeeper/trunk/src/c/src/zk_hashtable.c hadoop/zookeeper/trunk/src/c/src/zookeeper.c Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=903063&r1=903062&r2=903063&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Tue Jan 26 03:11:19 2010 @@ -212,6 +212,9 @@ ZOOKEEPER-413. two flaws need addressing in the c tests that can cause false positive failures (phunt via mahadev) + ZOOKEEPER-495. c client logs an invalid error when zookeeper_init is called + with chroot (phunt via mahadev) + IMPROVEMENTS: ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to "socket reuse" and failure to close client (phunt via mahadev) Modified: hadoop/zookeeper/trunk/src/c/src/zk_adaptor.h URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/src/zk_adaptor.h?rev=903063&r1=903062&r2=903063&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/src/zk_adaptor.h (original) +++ hadoop/zookeeper/trunk/src/c/src/zk_adaptor.h Tue Jan 26 03:11:19 2010 @@ -229,7 +229,7 @@ void process_completions(zhandle_t *zh); int flush_send_queue(zhandle_t*zh, int timeout); char* sub_string(zhandle_t *zh, const char* server_path); -void free_duplicate_path(char* free_path, const char* path); +void free_duplicate_path(const char* free_path, const char* path); void zoo_lock_auth(zhandle_t *zh); void zoo_unlock_auth(zhandle_t *zh); Modified: hadoop/zookeeper/trunk/src/c/src/zk_hashtable.c URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/src/zk_hashtable.c?rev=903063&r1=903062&r2=903063&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/src/zk_hashtable.c (original) +++ hadoop/zookeeper/trunk/src/c/src/zk_hashtable.c Tue Jan 26 03:11:19 2010 @@ -268,7 +268,9 @@ static void do_foreach_watcher(watcher_object_t* wo,zhandle_t* zh, const char* path,int type,int state) { - char *client_path = sub_string(zh, path); + // session event's don't have paths + const char *client_path = + (type != ZOO_SESSION_EVENT ? sub_string(zh, path) : path); while(wo!=0){ wo->watcher(zh,type,state,client_path,wo->context); wo=wo->next; Modified: hadoop/zookeeper/trunk/src/c/src/zookeeper.c URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/src/zookeeper.c?rev=903063&r1=903062&r2=903063&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/src/zookeeper.c (original) +++ hadoop/zookeeper/trunk/src/c/src/zookeeper.c Tue Jan 26 03:11:19 2010 @@ -713,9 +713,9 @@ * deallocated the free_path only its beeen allocated * and not equal to path */ -void free_duplicate_path(char *free_path, const char* path) { +void free_duplicate_path(const char *free_path, const char* path) { if (free_path != path) { - free(free_path); + free((void*)free_path); } }