You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/02/02 17:55:24 UTC
[44/45] incubator-ignite git commit: # ignite-121 : fix review
comments
# ignite-121 : fix review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72b557a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72b557a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72b557a8
Branch: refs/heads/ignite-121-logging
Commit: 72b557a8cbd4826f67a5b7d8b1fd811936f92b5c
Parents: 7c7ec7d
Author: Artem SHutak <as...@gridgain.com>
Authored: Mon Feb 2 19:47:09 2015 +0300
Committer: Artem SHutak <as...@gridgain.com>
Committed: Mon Feb 2 19:47:09 2015 +0300
----------------------------------------------------------------------
.../router/impl/GridRouterCommandLineStartup.java | 3 ++-
.../java/org/apache/ignite/internal/IgnitionEx.java | 13 +++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72b557a8/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
index 6dfe62b..676b750 100644
--- a/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/client/router/impl/GridRouterCommandLineStartup.java
@@ -133,13 +133,14 @@ public class GridRouterCommandLineStartup {
IgniteBiTuple<Object, Object> t = null;
Collection<Handler> savedHnds = null;
- if (isLog4jUsed)
+ if (isLog4jUsed) {
try {
t = U.addLog4jNoOpLogger();
}
catch (Exception e) {
isLog4jUsed = false;
}
+ }
if (!isLog4jUsed)
savedHnds = U.addJavaNoOpLogger();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72b557a8/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 605bce0..b7c57cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -725,13 +725,14 @@ public class IgnitionEx {
Collection<Handler> savedHnds = null;
- if (isLog4jUsed)
+ if (isLog4jUsed) {
try {
t = U.addLog4jNoOpLogger();
}
catch (IgniteCheckedException e) {
isLog4jUsed = false;
}
+ }
if (!isLog4jUsed)
savedHnds = U.addJavaNoOpLogger();
@@ -2015,8 +2016,8 @@ public class IgnitionEx {
log4jCls = null;
}
- try {
- if (log4jCls != null) {
+ if (log4jCls != null) {
+ try {
URL url = U.resolveGridGainUrl("config/ignite-log4j.xml");
if (url == null) {
@@ -2050,9 +2051,9 @@ public class IgnitionEx {
else
cfgLog = (IgniteLogger)log4jCls.newInstance();
}
- }
- catch (Exception e) {
- log4jInitException = e;
+ catch (Exception e) {
+ log4jInitException = e;
+ }
}
if (log4jCls == null || log4jInitException != null)