You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2014/05/24 16:42:01 UTC
svn commit: r1597311 -
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
Author: rpopma
Date: Sat May 24 14:42:00 2014
New Revision: 1597311
URL: http://svn.apache.org/r1597311
Log:
additional fix for LOG4J2-250: made Throwable field transient to avoid regression on LOG4J2-542
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java?rev=1597311&r1=1597310&r2=1597311&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java Sat May 24 14:42:00 2014
@@ -49,7 +49,7 @@ public class Log4jLogEvent implements Lo
private final String loggerName;
private final Message message;
private final long timeMillis;
- private final Throwable thrown;
+ private transient final Throwable thrown;
private ThrowableProxy thrownProxy;
private final Map<String, String> contextMap;
private final ThreadContext.ContextStack contextStack;
@@ -367,11 +367,13 @@ public class Log4jLogEvent implements Lo
* @return a LogEventProxy.
*/
protected Object writeReplace() {
+ getThrownProxy(); // ensure ThrowableProxy is initialized
return new LogEventProxy(this, this.includeLocation);
}
public static Serializable serialize(final Log4jLogEvent event,
final boolean includeLocation) {
+ event.getThrownProxy(); // ensure ThrowableProxy is initialized
return new LogEventProxy(event, includeLocation);
}