ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [13/50] [abbrv] incubator-ignite git commit: ignite-121 review
Date Tue, 03 Feb 2015 11:08:57 GMT
ignite-121 review


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/844bb3aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/844bb3aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/844bb3aa

Branch: refs/heads/ignite-140
Commit: 844bb3aacb009e7f486caab9e12f6b94eaa5e191
Parents: d438957
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Mon Feb 2 23:01:08 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Mon Feb 2 23:01:08 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/IgnitionEx.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/844bb3aa/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 1dcbab9..7380e15 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
@@ -2004,7 +2004,7 @@ public class IgnitionEx {
          */
         private IgniteLogger initLogger(@Nullable IgniteLogger cfgLog, UUID nodeId) throws
IgniteCheckedException {
             try {
-                Exception log4jInitException = null;
+                Exception log4jInitErr = null;
 
                 if (cfgLog == null) {
                     Class<?> log4jCls;
@@ -2052,11 +2052,11 @@ public class IgnitionEx {
                                 cfgLog = (IgniteLogger)log4jCls.newInstance();
                         }
                         catch (Exception e) {
-                            log4jInitException = e;
+                            log4jInitErr = e;
                         }
                     }
 
-                    if (log4jCls == null || log4jInitException != null)
+                    if (log4jCls == null || log4jInitErr != null)
                         cfgLog = new IgniteJavaLogger();
                 }
 
@@ -2064,9 +2064,9 @@ public class IgnitionEx {
                 if (cfgLog instanceof IgniteLoggerNodeIdAware)
                     ((IgniteLoggerNodeIdAware)cfgLog).setNodeId(nodeId);
 
-                if (log4jInitException != null)
+                if (log4jInitErr != null)
                     U.warn(cfgLog, "Failed to initialize IgniteLog4jLogger (falling back
to standard java logging): "
-                            + log4jInitException.getCause());
+                        + log4jInitErr.getCause());
 
                 return cfgLog;
             }


Mime
View raw message