You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/07 11:16:59 UTC
[14/50] [abbrv] ignite git commit: IGNITE-2649: Replaced all usages
of IgnitionEx.gridx() with IgnitionEx.localIgnite().
IGNITE-2649: Replaced all usages of IgnitionEx.gridx() with IgnitionEx.localIgnite().
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f7e3a87
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f7e3a87
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f7e3a87
Branch: refs/heads/ignite-2649
Commit: 6f7e3a8771b054f5678e310229e2f34f801f95d8
Parents: e5f3abd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Sep 5 12:47:08 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Sep 5 12:47:08 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/GridKernalContextImpl.java | 2 +-
.../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 | 2 +-
.../apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java | 2 +-
.../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 2 +-
.../apache/ignite/internal/processors/cache/GridCacheContext.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f7e3a87/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 ebc2688..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,7 @@ 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) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f7e3a87/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 f6bddca..b1da577 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
@@ -206,7 +206,7 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz
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/6f7e3a87/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 5e55706..62bfd4a 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
@@ -1302,7 +1302,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/6f7e3a87/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 c664f1e..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,7 @@ 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) :
new ClusterGroupAdapter(g.context(), subjId, p);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f7e3a87/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 4890231..26a9013 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
@@ -89,7 +89,7 @@ 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) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f7e3a87/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 05fd7d8..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,7 @@ 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) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6f7e3a87/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 b7c8592..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,7 @@ 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());