#ignite-239: 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/08df446b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08df446b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08df446b Branch: refs/heads/ignite-sql-tests Commit: 08df446b39f28b7a4b670650f0e39797c0cfa5c5 Parents: 0b1eccf Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Mar 2 12:15:13 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Mar 2 12:15:13 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/internal/IgnitionEx.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08df446b/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 c2c23f7..cb2efbf 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 @@ -1494,6 +1494,8 @@ public class IgnitionEx { UUID nodeId = cfg.getNodeId() != null ? cfg.getNodeId() : UUID.randomUUID(); + myCfg.setNodeId(nodeId); + IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), nodeId); assert cfgLog != null; @@ -1563,10 +1565,8 @@ public class IgnitionEx { } } - if (myCfg.getUserAttributes() == null) { - Map<String, ?> emptyAttr = Collections.emptyMap(); - myCfg.setUserAttributes(emptyAttr); - } + if (myCfg.getUserAttributes() == null) + myCfg.setUserAttributes(Collections.<String, Object>emptyMap()); if (myCfg.getMBeanServer() == null) myCfg.setMBeanServer(ManagementFactory.getPlatformMBeanServer()); @@ -1606,8 +1606,6 @@ public class IgnitionEx { if (myCfg.getPeerClassLoadingLocalClassPathExclude() == null) myCfg.setPeerClassLoadingLocalClassPathExclude(EMPTY_STR_ARR); - myCfg.setNodeId(nodeId); - IgfsConfiguration[] igfsCfgs = myCfg.getIgfsConfiguration(); if (igfsCfgs != null) {
