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 8BD0AF760 for ; Mon, 1 Apr 2013 06:30:56 +0000 (UTC) Received: (qmail 3461 invoked by uid 500); 1 Apr 2013 06:30:56 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 3393 invoked by uid 500); 1 Apr 2013 06:30:54 -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 3365 invoked by uid 99); 1 Apr 2013 06:30:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 06:30:53 +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 06:30:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D8E22238897F; Mon, 1 Apr 2013 06:30:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1463087 - /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java Date: Mon, 01 Apr 2013 06:30:31 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130401063031.D8E22238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Mon Apr 1 06:30:31 2013 New Revision: 1463087 URL: http://svn.apache.org/r1463087 Log: LOG4J2-164 - Add change that was missing from provided patch. Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java?rev=1463087&r1=1463086&r2=1463087&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java Mon Apr 1 06:30:31 2013 @@ -113,7 +113,7 @@ public abstract class AbstractOutputStre final byte[] bytes = getLayout().toByteArray(event); if (bytes.length > 0) { manager.write(bytes); - if (this.immediateFlush) { + if (this.immediateFlush || event.isEndOfBatch()) { manager.flush(); } }