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:25:16 UTC
svn commit: r1596395 -
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
Author: ggregory
Date: Tue May 20 20:25:15 2014
New Revision: 1596395
URL: http://svn.apache.org/r1596395
Log:
Do not hide.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1596395&r1=1596394&r2=1596395&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Tue May 20 20:25:15 2014
@@ -140,20 +140,20 @@ public final class PatternLayout extends
@Override
public byte[] getHeader() {
- byte [] header = super.getHeader();
- if (header != null) {
- return config.getStrSubstitutor().replace(new String(header, getCharset())).getBytes(getCharset());
+ byte [] myHeader = super.getHeader();
+ if (myHeader != null) {
+ return config.getStrSubstitutor().replace(new String(myHeader, getCharset())).getBytes(getCharset());
}
- return header;
+ return myHeader;
}
@Override
public byte[] getFooter() {
- byte [] footer = super.getFooter();
- if (footer != null) {
- return config.getStrSubstitutor().replace(new String(footer, getCharset())).getBytes(getCharset());
+ byte [] myFooter = super.getFooter();
+ if (myFooter != null) {
+ return config.getStrSubstitutor().replace(new String(myFooter, getCharset())).getBytes(getCharset());
}
- return footer;
+ return myFooter;
}
/**