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/09/25 04:58:39 UTC

[2/2] git commit: Statement unnecessarily nested within else clause.

Statement unnecessarily nested within else clause.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6a5fc025
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6a5fc025
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6a5fc025

Branch: refs/heads/master
Commit: 6a5fc02500e2f6b08b64f17470098e63858ad335
Parents: 842f251
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Sep 24 22:58:34 2014 -0400
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Sep 24 22:58:34 2014 -0400

----------------------------------------------------------------------
 .../logging/log4j/core/pattern/PatternParser.java    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6a5fc025/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
index 08ae3eb..510498e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
@@ -260,14 +260,13 @@ public final class PatternParser {
                 end = pattern.indexOf('}', i);
                 if (end == -1) {
                     break;
-                } else {
-                    final int next = pattern.indexOf("{", i);
-                    if (next != -1 && next < end) {
-                        i = end + 1;
-                        ++depth;
-                    } else if (depth > 0) {
-                        --depth;
-                    }
+                }
+                final int next = pattern.indexOf("{", i);
+                if (next != -1 && next < end) {
+                    i = end + 1;
+                    ++depth;
+                } else if (depth > 0) {
+                    --depth;
                 }
             } while (depth > 0);