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 2015/05/14 16:22:26 UTC

logging-log4j2 git commit: Statement unnecessarily nested within else clause.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 3004e73b0 -> c5adc863e


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/c5adc863
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c5adc863
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c5adc863

Branch: refs/heads/master
Commit: c5adc863e727582289458880f502629f453d9c58
Parents: 3004e73
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu May 14 07:22:11 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Thu May 14 07:22:11 2015 -0700

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/lookup/StrSubstitutor.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5adc863/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
index 77362bc..f322d0e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
@@ -979,10 +979,9 @@ public class StrSubstitutor {
                                 priorVariables
                                         .remove(priorVariables.size() - 1);
                                 break;
-                            } else {
-                                nestedVarCount--;
-                                pos += endMatchLen;
                             }
+                            nestedVarCount--;
+                            pos += endMatchLen;
                         }
                     }
                 }