You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/03/02 17:30:09 UTC
[23/50] incubator-ignite git commit: #ignite-239: fix logger.
#ignite-239: fix logger.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39428532
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39428532
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39428532
Branch: refs/heads/ignite-368
Commit: 39428532fbd3fc402323b7e4580328fcc11cf653
Parents: 535aaf4
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Feb 27 12:23:51 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Feb 27 12:23:51 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 6 ++++--
.../cache/datastructures/GridCacheQueueCleanupSelfTest.java | 1 -
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39428532/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 f70836c..32a3d71 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
@@ -1307,11 +1307,13 @@ public class IgnitionEx {
System.setProperty(IGNITE_CONFIG_URL, startCtx.configUrl().toString());
// Initialize factory's log.
- IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), cfg.getNodeId());
+ UUID nodeId = cfg.getNodeId() != null ? cfg.getNodeId() : UUID.randomUUID();
+
+ IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), nodeId);
assert cfgLog != null;
- cfgLog = new GridLoggerProxy(cfgLog, null, name, U.id8(cfg.getNodeId()));
+ cfgLog = new GridLoggerProxy(cfgLog, null, name, U.id8(nodeId));
log = cfgLog.getLogger(G.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39428532/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
index e61d15b..1192426 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.datastructures;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.datastructures.*;