From commits-return-11431-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed Jul 6 13:02:07 2011 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 8F5EC6AE4 for ; Wed, 6 Jul 2011 13:02:07 +0000 (UTC) Received: (qmail 89711 invoked by uid 500); 6 Jul 2011 13:02:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 89629 invoked by uid 500); 6 Jul 2011 13:02:06 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 89622 invoked by uid 99); 6 Jul 2011 13:02:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jul 2011 13:02:06 +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, 06 Jul 2011 13:02:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9C84D23888FE; Wed, 6 Jul 2011 13:01:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1143393 - /jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java Date: Wed, 06 Jul 2011 13:01:45 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110706130145.9C84D23888FE@eris.apache.org> Author: mduerig Date: Wed Jul 6 13:01:45 2011 New Revision: 1143393 URL: http://svn.apache.org/viewvc?rev=1143393&view=rev Log: fix getEvents Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java?rev=1143393&r1=1143392&r2=1143393&view=diff ============================================================================== --- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java (original) +++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/SubscriptionImpl.java Wed Jul 6 13:01:45 2011 @@ -69,6 +69,7 @@ public class SubscriptionImpl implements } public EventBundle[] getEvents(long timeout) throws RepositoryException, InterruptedException { + String head = microKernel.waitForCommit(microKernel.getHeadRevision(), timeout); List eventBundles = new ArrayList(); @@ -82,8 +83,7 @@ public class SubscriptionImpl implements current = next; } - String old = current.getStartRevision(); - String head = microKernel.waitForCommit(old, timeout); + microKernel.getHeadRevision(); eventBundles.addAll(current.getEventsBundles(head)); eventSources.add(current.update(head)); }