Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 98841 invoked from network); 27 Feb 2009 20:04:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Feb 2009 20:04:58 -0000 Received: (qmail 66090 invoked by uid 500); 27 Feb 2009 20:04:58 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 66075 invoked by uid 500); 27 Feb 2009 20:04:57 -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 66064 invoked by uid 99); 27 Feb 2009 20:04:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Feb 2009 12:04:57 -0800 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; Fri, 27 Feb 2009 20:04:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 35551238889F; Fri, 27 Feb 2009 20:04:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r748676 - in /hadoop/zookeeper/branches/branch-3.1: CHANGES.txt src/c/src/zookeeper.c Date: Fri, 27 Feb 2009 20:04:37 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090227200437.35551238889F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Fri Feb 27 20:04:36 2009 New Revision: 748676 URL: http://svn.apache.org/viewvc?rev=748676&view=rev Log: ZOOKEEPER-320. call auth completion in free_completions(). (chris darroch via mahadev) Modified: hadoop/zookeeper/branches/branch-3.1/CHANGES.txt hadoop/zookeeper/branches/branch-3.1/src/c/src/zookeeper.c Modified: hadoop/zookeeper/branches/branch-3.1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.1/CHANGES.txt?rev=748676&r1=748675&r2=748676&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.1/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.1/CHANGES.txt Fri Feb 27 20:04:36 2009 @@ -17,6 +17,9 @@ ZOOKEEPER-319. add locking around auth info in zhandle_t (chris darroch via mahadev) + ZOOKEEPER-320. call auth completion in free_completions(). (chris darroch +via mahadev) + IMPROVEMENTS: NEW FEATURES: Modified: hadoop/zookeeper/branches/branch-3.1/src/c/src/zookeeper.c URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.1/src/c/src/zookeeper.c?rev=748676&r1=748675&r2=748676&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.1/src/c/src/zookeeper.c (original) +++ hadoop/zookeeper/branches/branch-3.1/src/c/src/zookeeper.c Fri Feb 27 20:04:36 2009 @@ -761,6 +761,8 @@ completion_head_t tmp_list; struct oarchive *oa; struct ReplyHeader h; + void_completion_t auth_completion = NULL; + const char *auth_data = NULL; lock_completion_list(&zh->sent_requests); tmp_list = zh->sent_requests; @@ -800,6 +802,18 @@ } } } + + zoo_lock_auth(zh); + if (zh->auth.completion) { + auth_completion = zh->auth.completion; + auth_data = zh->auth.data; + zh->auth.completion = 0; + } + zoo_unlock_auth(zh); + + if (auth_completion) { + auth_completion(reason, auth_data); + } } static void cleanup_bufs(zhandle_t *zh,int callCompletion,int rc)