#ignite-239: fix logger.

apache · Feb 27, 2015 · 3942853 · 3942853
1 parent 535aaf4
commit 3942853
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
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
@@ -1307,11 +1307,13 @@ private void start0(GridStartContext startCtx) throws IgniteCheckedException {
                 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);
 

diff --git a/...apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/...apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java
@@ -20,7 +20,6 @@
 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.*;