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 34EA4950A for ; Tue, 5 Jun 2012 10:11:42 +0000 (UTC) Received: (qmail 41361 invoked by uid 500); 5 Jun 2012 10:11:42 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 41270 invoked by uid 500); 5 Jun 2012 10:11:41 -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 41250 invoked by uid 99); 5 Jun 2012 10:11:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2012 10:11:40 +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, 05 Jun 2012 10:11:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 753B62388AA6 for ; Tue, 5 Jun 2012 10:11:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1346328 - in /zookeeper/bookkeeper/branches/branch-4.1: CHANGES.txt hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestZkSubscriptionManager.java Date: Tue, 05 Jun 2012 10:11:19 -0000 To: commits@zookeeper.apache.org From: sijie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120605101119.753B62388AA6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sijie Date: Tue Jun 5 10:11:18 2012 New Revision: 1346328 URL: http://svn.apache.org/viewvc?rev=1346328&view=rev Log: BOOKKEEPER-285: TestZkSubscriptionManager quits due to NPE, so other tests are not run in hedwig server. (sijie) Modified: zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestZkSubscriptionManager.java Modified: zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt?rev=1346328&r1=1346327&r2=1346328&view=diff ============================================================================== --- zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt (original) +++ zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt Tue Jun 5 10:11:18 2012 @@ -150,6 +150,8 @@ Release 4.1.0 - 2012-05-31 BOOKKEEPER-146: TestConcurrentTopicAcquisition sometimes hangs (ivank) + BOOKKEEPER-285: TestZkSubscriptionManager quits due to NPE, so other tests are not run in hedwig server. (sijie) + bookkeeper-benchmark/ BOOKKEEPER-207: BenchBookie doesn't run correctly (ivank via fpj) Modified: zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestZkSubscriptionManager.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestZkSubscriptionManager.java?rev=1346328&r1=1346327&r2=1346328&view=diff ============================================================================== --- zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestZkSubscriptionManager.java (original) +++ zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestZkSubscriptionManager.java Tue Jun 5 10:11:18 2012 @@ -31,6 +31,7 @@ import org.apache.hedwig.protocol.PubSub import org.apache.hedwig.protocol.PubSubProtocol.SubscribeRequest.CreateOrAttach; import org.apache.hedwig.server.common.ServerConfiguration; import org.apache.hedwig.server.topics.TrivialOwnAllTopicManager; +import org.apache.hedwig.server.persistence.LocalDBPersistenceManager; import org.apache.hedwig.util.ConcurrencyUtils; import org.apache.hedwig.util.Either; import org.apache.hedwig.util.Callback; @@ -50,7 +51,8 @@ public class TestZkSubscriptionManager e super.setUp(); cfg = new ServerConfiguration(); final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); - sm = new ZkSubscriptionManager(zk, new TrivialOwnAllTopicManager(cfg, scheduler), null, cfg, scheduler); + sm = new ZkSubscriptionManager(zk, new TrivialOwnAllTopicManager(cfg, scheduler), + LocalDBPersistenceManager.instance(), cfg, scheduler); msgIdCallback = new Callback() { @Override public void operationFailed(Object ctx, final PubSubException exception) {