#Fixes after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72365618 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72365618 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72365618 Branch: refs/heads/ingite-9655-merge Commit: 72365618e7040ed3fded571e2a6c8c456608afd9 Parents: f13453f Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Jan 29 14:08:22 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Jan 29 14:08:22 2015 -0800 ---------------------------------------------------------------------- .../processors/cache/IgnitePutAllLargeBatchSelfTest.java | 2 +- .../cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java | 2 +- .../cache/distributed/IgniteCrossCacheTxStoreSelfTest.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72365618/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java index 933d48a..e73504f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java @@ -183,7 +183,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { // Check that no stale transactions left and all locks are released. for (int g = 0; g < GRID_CNT; g++) { - GridKernal k = (GridKernal)grid(g); + IgniteKernal k = (IgniteKernal)grid(g); GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72365618/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java index b6119da..02b2d67 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -94,7 +94,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA // Check that no stale transactions left and all locks are released. for (int g = 0; g < GRID_CNT; g++) { - GridKernal k = (GridKernal)grid(g); + IgniteKernal k = (IgniteKernal)grid(g); GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/72365618/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java index 7df7619..f80549c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java @@ -108,7 +108,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testWriteThrough() throws Exception { - GridEx grid = grid(0); + IgniteEx grid = grid(0); TestStore firstStore = (TestStore)grid(0).configuration().getCacheConfiguration()[1].getCacheStoreFactory().create(); @@ -153,7 +153,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIncompatibleCaches1() throws Exception { - GridEx grid = grid(0); + IgniteEx grid = grid(0); try (IgniteTx ignored = grid.transactions().txStart()) { GridCache<Object, Object> cacheA = grid.cache("cacheA"); @@ -174,7 +174,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testIncompatibleCaches2() throws Exception { - GridEx grid = grid(0); + IgniteEx grid = grid(0); try (IgniteTx ignored = grid.transactions().txStart()) { GridCache<Object, Object> cacheA = grid.cache("cacheA");
