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/19 17:00:52 UTC

svn commit: r1595926 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java

Author: ggregory
Date: Mon May 19 15:00:52 2014
New Revision: 1595926

URL: http://svn.apache.org/r1595926
Log:
Statement unnecessarily nested within else clause.

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=1595926&r1=1595925&r2=1595926&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 Mon May 19 15:00:52 2014
@@ -143,9 +143,8 @@ public final class PatternLayout extends
         byte [] header = super.getHeader();
         if (header != null) {
             return config.getStrSubstitutor().replace(new String(header, getCharset())).getBytes(getCharset());
-        } else {
-            return header;
         }
+        return header;
     }
 
     @Override
@@ -153,9 +152,8 @@ public final class PatternLayout extends
         byte [] footer = super.getFooter();
         if (footer != null) {
             return config.getStrSubstitutor().replace(new String(footer, getCharset())).getBytes(getCharset());
-        } else {
-            return footer;
         }
+        return footer;
     }
 
     /**