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/09/28 23:46:29 UTC
logging-log4j2 git commit: Statement unnecessarily nested within else
clause.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1136 77e5d1d09 -> 54a54994c
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/54a54994
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/54a54994
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/54a54994
Branch: refs/heads/LOG4J2-1136
Commit: 54a54994cc1f60d717a46eb334be8f340ca8edab
Parents: 77e5d1d
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 28 14:46:26 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 28 14:46:26 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/script/ScriptManager.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/54a54994/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
index 464d771..f735846 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
@@ -142,13 +142,12 @@ public class ScriptManager {
logger.error("Error running script " + script.getName(), ex);
return null;
}
- } else {
- try {
- return scriptEngine.eval(script.getScriptText(), bindings);
- } catch (ScriptException ex) {
- logger.error("Error running script " + script.getName(), ex);
- return null;
- }
+ }
+ try {
+ return scriptEngine.eval(script.getScriptText(), bindings);
+ } catch (ScriptException ex) {
+ logger.error("Error running script " + script.getName(), ex);
+ return null;
}
}