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 0DD42109E1 for ; Sun, 12 Jan 2014 22:22:01 +0000 (UTC) Received: (qmail 54987 invoked by uid 500); 12 Jan 2014 22:21:57 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 54968 invoked by uid 500); 12 Jan 2014 22:21:53 -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 54955 invoked by uid 99); 12 Jan 2014 22:21:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Jan 2014 22:21:49 +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; Sun, 12 Jan 2014 22:21:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 632CA23888FE; Sun, 12 Jan 2014 22:21:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1557619 - /logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java Date: Sun, 12 Jan 2014 22:21:26 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140112222126.632CA23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Sun Jan 12 22:21:25 2014 New Revision: 1557619 URL: http://svn.apache.org/r1557619 Log: Ignore linefeed character in LoggerStream Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java?rev=1557619&r1=1557618&r2=1557619&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java (original) +++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java Sun Jan 12 22:21:25 2014 @@ -280,6 +280,9 @@ public class LoggerStream extends PrintS @Override public synchronized void write(int b) { + if (b == '\r') { + return; + } super.write(b); if (b == '\n') { log(count - 1); @@ -288,10 +291,8 @@ public class LoggerStream extends PrintS @Override public synchronized void write(byte[] b, int off, int len) { - super.write(b, off, len); - int newLine = lastIndexOf('\n'); - if (newLine != -1) { - log(newLine); + for (int i = 0; i < len; ++i) { + write(b[off + i]); } } }