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 E1E31F1FD for ; Mon, 29 Apr 2013 03:32:47 +0000 (UTC) Received: (qmail 34920 invoked by uid 500); 29 Apr 2013 03:32:47 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 34896 invoked by uid 500); 29 Apr 2013 03:32:47 -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 34889 invoked by uid 99); 29 Apr 2013 03:32:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2013 03:32:47 +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, 29 Apr 2013 03:32:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 685EE23889FA; Mon, 29 Apr 2013 03:32:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1476885 - /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java Date: Mon, 29 Apr 2013 03:32:24 -0000 To: commits@logging.apache.org From: rpopma@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130429033224.685EE23889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpopma Date: Mon Apr 29 03:32:23 2013 New Revision: 1476885 URL: http://svn.apache.org/r1476885 Log: checkstyle: removed trailing spaces Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java?rev=1476885&r1=1476884&r2=1476885&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java Mon Apr 29 03:32:23 2013 @@ -282,7 +282,7 @@ public class Log4jLogEvent implements Lo return new LogEventProxy(this, this.includeLocation); } - public static Serializable serialize(final Log4jLogEvent event, + public static Serializable serialize(final Log4jLogEvent event, final boolean includeLocation) { return new LogEventProxy(event, includeLocation); } @@ -293,9 +293,9 @@ public class Log4jLogEvent implements Lo } if (event instanceof LogEventProxy) { final LogEventProxy proxy = (LogEventProxy) event; - Log4jLogEvent result = new Log4jLogEvent(proxy.name, proxy.marker, - proxy.fqcnOfLogger, proxy.level, proxy.message, - proxy.throwable, proxy.mdc, proxy.ndc, proxy.threadName, + Log4jLogEvent result = new Log4jLogEvent(proxy.name, proxy.marker, + proxy.fqcnOfLogger, proxy.level, proxy.message, + proxy.throwable, proxy.mdc, proxy.ndc, proxy.threadName, proxy.location, proxy.timestamp); result.setEndOfBatch(proxy.isEndOfBatch); result.setIncludeLocation(proxy.isLocationRequired); @@ -359,8 +359,8 @@ public class Log4jLogEvent implements Lo * @return Log4jLogEvent. */ protected Object readResolve() { - Log4jLogEvent result = new Log4jLogEvent(name, marker, fqcnOfLogger, - level, message, throwable, mdc, ndc, threadName, location, + Log4jLogEvent result = new Log4jLogEvent(name, marker, fqcnOfLogger, + level, message, throwable, mdc, ndc, threadName, location, timestamp); result.setEndOfBatch(isEndOfBatch); result.setIncludeLocation(isLocationRequired);