Ignite-35 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/6d5ed0eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d5ed0eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d5ed0eb Branch: refs/heads/ignite-32 Commit: 6d5ed0ebe6c6c57d0eaa05710f0e7697db2e81f9 Parents: 61a5b76 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Jan 22 20:19:16 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Jan 22 20:19:16 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/gridgain/grid/kernal/GridKernal.java | 9 +-------- .../org/gridgain/grid/kernal/GridKernalContextImpl.java | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d5ed0eb/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java index 2e71ca6..d9202f3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java @@ -2441,14 +2441,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe /** {@inheritDoc} */ @Override public IgniteLogger log() { - guard(); - - try { - return log; - } - finally { - unguard(); - } + return log; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d5ed0eb/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java index 69d2409..8565a83 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java @@ -485,7 +485,7 @@ public class GridKernalContextImpl extends GridMetadataAwareAdapter implements G /** {@inheritDoc} */ @Override public UUID localNodeId() { - return discovery() == null ? cfg.getNodeId() : discovery().localNode().id(); + return cfg.getNodeId(); } /** {@inheritDoc} */
