Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 791F3F4C9 for ; Mon, 1 Apr 2013 23:30:18 +0000 (UTC) Received: (qmail 20894 invoked by uid 500); 1 Apr 2013 23:30:18 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 20870 invoked by uid 500); 1 Apr 2013 23:30:18 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 20862 invoked by uid 99); 1 Apr 2013 23:30:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 23:30:18 +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; Mon, 01 Apr 2013 23:30:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E9784238889B; Mon, 1 Apr 2013 23:29:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1463333 - /logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Date: Mon, 01 Apr 2013 23:29:54 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130401232954.E9784238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Mon Apr 1 23:29:54 2013 New Revision: 1463333 URL: http://svn.apache.org/r1463333 Log: Only include up to batchSize events in a batch Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java?rev=1463333&r1=1463332&r2=1463333&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Mon Apr 1 23:29:54 2013 @@ -343,7 +343,7 @@ public class FlumePersistentManager exte status = cursor.getFirst(key, data, LockMode.RMW); if (batchSize > 1) { BatchEvent batch = new BatchEvent(); - while (status == OperationStatus.SUCCESS) { + for (int i = 0; status == OperationStatus.SUCCESS && i < batchSize; ++i) { SimpleEvent event = createEvent(data); if (event != null) { batch.addEvent(event);