WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c3d4f03f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c3d4f03f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c3d4f03f Branch: refs/heads/ignite-2649 Commit: c3d4f03f10b4840bff5af6fca31aebb3d99b08ad Parents: eed52be Author: vozerov-gridgain <[email protected]> Authored: Thu Sep 8 10:46:41 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Sep 8 10:46:41 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/GridKernalContextImpl.java | 1 - .../src/main/java/org/apache/ignite/internal/GridLoggerProxy.java | 2 -- .../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +- .../org/apache/ignite/internal/cluster/ClusterGroupAdapter.java | 1 - .../apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java | 1 - .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 1 - .../apache/ignite/internal/processors/cache/GridCacheContext.java | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c3d4f03f/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 90edc77..9a3fda2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -875,7 +875,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable */ protected Object readResolve() throws ObjectStreamException { try { -// return IgnitionEx.gridx(stash.get()).context(); return IgnitionEx.localIgnite().context(); } catch (IllegalStateException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c3d4f03f/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java index df7ca0c..149b05e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java @@ -203,10 +203,8 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz try { IgniteBiTuple<String, Object> t = stash.get(); - String gridNameR = t.get1(); Object ctgrR = t.get2(); -// IgniteLogger log = IgnitionEx.gridx(gridNameR).log(); IgniteLogger log = IgnitionEx.localIgnite().log(); return ctgrR != null ? log.getLogger(ctgrR) : log; http://git-wip-us.apache.org/repos/asf/ignite/blob/c3d4f03f/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 666d01a..6791afc 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 @@ -1303,7 +1303,7 @@ public class IgnitionEx { * @param name Grid name. * @return Grid instance. */ - public static IgniteKernal gridx(@Nullable String name) { + private static IgniteKernal gridx(@Nullable String name) { IgniteNamedInstance grid = name != null ? grids.get(name) : dfltGrid; IgniteKernal res; http://git-wip-us.apache.org/repos/asf/ignite/blob/c3d4f03f/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java index 7ad8e8e..648c86d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java @@ -727,7 +727,6 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { */ protected Object readResolve() throws ObjectStreamException { try { -// IgniteKernal g = IgnitionEx.gridx(gridName); IgniteKernal g = IgnitionEx.localIgnite(); return ids != null ? new ClusterGroupAdapter(g.context(), subjId, ids) : http://git-wip-us.apache.org/repos/asf/ignite/blob/c3d4f03f/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java index e2307aa..3147b12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java @@ -90,7 +90,6 @@ public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> impl */ protected Object readResolve() throws ObjectStreamException { try { -// return IgnitionEx.gridx(stash.get()).cluster().nodeLocalMap(); return IgnitionEx.localIgnite().cluster().nodeLocalMap(); } catch (IllegalStateException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c3d4f03f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 885f8c6..84d3fdf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4770,7 +4770,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V try { IgniteBiTuple<String, String> t = stash.get(); -// return IgnitionEx.gridx(t.get1()).cachex(t.get2()); return IgnitionEx.localIgnite().cachex(t.get2()); } catch (IllegalStateException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c3d4f03f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index eb803ae..91ace02 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -2045,7 +2045,6 @@ public class GridCacheContext<K, V> implements Externalizable { try { IgniteBiTuple<String, String> t = stash.get(); -// IgniteKernal grid = IgnitionEx.gridx(t.get1()); IgniteKernal grid = IgnitionEx.localIgnite(); GridCacheAdapter<K, V> cache = grid.internalCache(t.get2());
