You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/05/20 22:42:27 UTC
svn commit: r1596402 -
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
Author: ggregory
Date: Tue May 20 20:42:26 2014
New Revision: 1596402
URL: http://svn.apache.org/r1596402
Log:
Don't hide superclass field.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java?rev=1596402&r1=1596401&r2=1596402&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java Tue May 20 20:42:26 2014
@@ -33,14 +33,14 @@ import org.apache.logging.log4j.core.con
@Plugin(name = "SerializedLayout", category = "Core", elementType = "layout", printObject = true)
public final class SerializedLayout extends AbstractLayout<LogEvent> {
- private static byte[] header;
+ private static byte[] serializedHeader;
static {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
final ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.close();
- header = baos.toByteArray();
+ serializedHeader = baos.toByteArray();
} catch (final Exception ex) {
LOGGER.error("Unable to generate Object stream header", ex);
}
@@ -94,7 +94,7 @@ public final class SerializedLayout exte
@Override
public byte[] getHeader() {
- return header;
+ return serializedHeader;
}
/**