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 A74109AA4 for ; Tue, 25 Oct 2011 15:16:52 +0000 (UTC) Received: (qmail 19524 invoked by uid 500); 25 Oct 2011 15:16:52 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 19487 invoked by uid 500); 25 Oct 2011 15:16:52 -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 19478 invoked by uid 99); 25 Oct 2011 15:16:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2011 15:16:52 +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; Tue, 25 Oct 2011 15:16:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1EDCD23888E4 for ; Tue, 25 Oct 2011 15:16:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1188704 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java Date: Tue, 25 Oct 2011 15:16:31 -0000 To: commits@zookeeper.apache.org From: ivank@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111025151631.1EDCD23888E4@eris.apache.org> Author: ivank Date: Tue Oct 25 15:16:30 2011 New Revision: 1188704 URL: http://svn.apache.org/viewvc?rev=1188704&view=rev Log: BOOKKEEPER-92: using wrong context object in readLastConfirmedComplete callback (Sijie Guo via ivank) Modified: zookeeper/bookkeeper/trunk/CHANGES.txt zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java Modified: zookeeper/bookkeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1188704&r1=1188703&r2=1188704&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/CHANGES.txt (original) +++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Oct 25 15:16:30 2011 @@ -48,6 +48,8 @@ BUGFIXES: BOOKKEEPER-84: Add versioning for ZK metadata (ivank via breed) + BOOKKEEPER-92: using wrong context object in readLastConfirmedComplete callback (Sijie Guo via ivank) + hedwig-server/ BOOKKEEPER-43: NullPointException when releasing topic (Sijie Guo via breed) @@ -60,8 +62,6 @@ BUGFIXES: BOOKKEEPER-52: Message sequence confuse due to the subscribeMsgQueue@SubscribeResponseHandler (xulei via ivank) - hedwig-benchmark/ - BOOKKEEPER-88: derby doesn't like - in the topic names (breed via ivank) IMPROVEMENTS: Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java?rev=1188704&r1=1188703&r2=1188704&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java Tue Oct 25 15:16:30 2011 @@ -93,8 +93,8 @@ class ReadLastConfirmedOp implements Rea if (numResponsesPending == 0) { // Have got all responses back but was still not enough, just fail the operation - LOG.error("While recovering ledger: " + ledgerId + " did not hear success responses from all quorums"); - cb.readLastConfirmedComplete(BKException.Code.LedgerRecoveryException, maxAddConfirmed, ctx); + LOG.error("While readLastConfirmed ledger: " + ledgerId + " did not hear success responses from all quorums"); + cb.readLastConfirmedComplete(BKException.Code.LedgerRecoveryException, maxAddConfirmed, this.ctx); } }