GG-9141 - More fixes for commented tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7a96e1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7a96e1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7a96e1f Branch: refs/heads/ignite-1 Commit: c7a96e1f90437f408fc2d5ced4f42cdc168ba5e3 Parents: 77dc56c Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Dec 19 14:37:59 2014 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Dec 19 14:37:59 2014 -0800 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7a96e1f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 035f9a2..e18fe82 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -197,7 +197,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte e.cached(cached, cached.keyBytes()); } - if (e.cached().detached()) + if (e.cached().detached() || e.cached().isLocal()) continue; while (true) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7a96e1f/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java index 50ec002..d684215 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheFullApiSelfTestSuite.java @@ -27,7 +27,7 @@ public class GridCacheFullApiSelfTestSuite extends TestSuite { TestSuite suite = new TestSuite("Gridgain Cache Full API Test Suite"); // One node. - //suite.addTestSuite(GridCacheLocalFullApiSelfTest.class); GG-9141 + suite.addTestSuite(GridCacheLocalFullApiSelfTest.class); suite.addTestSuite(GridCacheLocalAtomicFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedFullApiSelfTest.class); @@ -44,7 +44,7 @@ public class GridCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedNearOnlyNoPrimaryFullApiSelfTest.class); // One node with off-heap values. - //suite.addTestSuite(GridCacheLocalOffHeapFullApiSelfTest.class); GG-9141 + suite.addTestSuite(GridCacheLocalOffHeapFullApiSelfTest.class); suite.addTestSuite(GridCacheLocalAtomicOffHeapFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedOffHeapFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedOffHeapFullApiSelfTest.class); @@ -96,7 +96,7 @@ public class GridCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.class); // Private cache API. - //suite.addTestSuite(GridCacheExLocalFullApiSelfTest.class); GG-9141 + suite.addTestSuite(GridCacheExLocalFullApiSelfTest.class); suite.addTestSuite(GridCacheExReplicatedFullApiSelfTest.class); suite.addTestSuite(GridCacheExNearFullApiSelfTest.class); suite.addTestSuite(GridCacheExColocatedFullApiSelfTest.class);
