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 7FC2B731A for ; Wed, 31 Aug 2011 15:00:10 +0000 (UTC) Received: (qmail 31708 invoked by uid 500); 31 Aug 2011 15:00:10 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 31644 invoked by uid 500); 31 Aug 2011 15:00:09 -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 31636 invoked by uid 99); 31 Aug 2011 15:00:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Aug 2011 15:00:09 +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, 31 Aug 2011 15:00:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E4B2F23889F7 for ; Wed, 31 Aug 2011 14:59:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1163655 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java Date: Wed, 31 Aug 2011 14:59:46 -0000 To: commits@zookeeper.apache.org From: ivank@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110831145946.E4B2F23889F7@eris.apache.org> Author: ivank Date: Wed Aug 31 14:59:46 2011 New Revision: 1163655 URL: http://svn.apache.org/viewvc?rev=1163655&view=rev Log: BOOKKEEPER-57: NullPointException at bookie.zk@EntryLogger (xulei via ivank) Modified: zookeeper/bookkeeper/trunk/CHANGES.txt zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java Modified: zookeeper/bookkeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1163655&r1=1163654&r2=1163655&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/CHANGES.txt (original) +++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Aug 31 14:59:46 2011 @@ -36,12 +36,15 @@ BUGFIXES: BOOKKEEPER-18: maven build is unstable (morel, ivank via ivank) + BOOKKEEPER-57: NullPointException at bookie.zk@EntryLogger (xulei via ivank) + hedwig-server/ BOOKKEEPER-43: NullPointException when releasing topic (Sijie Guo via breed) BOOKKEEPER-51: NullPointException at FIFODeliveryManager#deliveryPtrs (xulei via ivank) + hedwig-client/ BOOKKEEPER-52: Message sequence confuse due to the subscribeMsgQueue@SubscribeResponseHandler (xulei via ivank) Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java?rev=1163655&r1=1163654&r2=1163655&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java Wed Aug 31 14:59:46 2011 @@ -142,7 +142,7 @@ public class EntryLogger { } } // Initialization check. No need to run any logic if we are still starting up. - if (entryLogs2LedgersMap.isEmpty() || bookie.ledgerCache == null + if (bookie.zk == null || entryLogs2LedgersMap.isEmpty() || bookie.ledgerCache == null || bookie.ledgerCache.activeLedgers == null) { continue; }