You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/08/19 11:51:36 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-3299
Merge remote-tracking branch 'remotes/origin/master' into ignite-3299
# Conflicts:
# modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4148d690
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4148d690
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4148d690
Branch: refs/heads/ignite-3299
Commit: 4148d6903c05cd041242869c6eeef1bb5a4c352b
Parents: 463b421
Author: sboikov <sb...@gridgain.com>
Authored: Fri Aug 19 14:51:25 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Aug 19 14:51:25 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 4 +---
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java | 2 --
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4148d690/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 88b83e7..d79a9c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -4170,7 +4170,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
CacheObject prev = saveOldValueUnlocked(false);
- if (!deletedUnlocked() && !hasReaders() && markObsolete0(obsoleteVer, false, null)) {
+ if (!hasReaders() && markObsolete0(obsoleteVer, false, null)) {
if (swap) {
if (!isStartVersion()) {
try {
@@ -4285,8 +4285,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
']');
}
- assert !deletedUnlocked();
-
cctx.swap().removeOffheap(key());
value(prevVal);
http://git-wip-us.apache.org/repos/asf/ignite/blob/4148d690/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index c335f95..8c1c6f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -29,7 +29,6 @@ import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinity
import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinityAssignmentNodeJoinValidationTest;
import org.apache.ignite.internal.processors.cache.distributed.CacheLateAffinityAssignmentTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheTxIteratorSelfTest;
-import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheConcurrentPutGetRemove;
import org.apache.ignite.internal.processors.cache.distributed.replicated.IgniteCacheSyncRebalanceModeSelfTest;
import org.apache.ignite.internal.processors.cache.store.IgniteCacheWriteBehindNoUpdateSelfTest;
@@ -56,7 +55,6 @@ public class IgniteCacheTestSuite5 extends TestSuite {
suite.addTestSuite(CacheLateAffinityAssignmentNodeJoinValidationTest.class);
suite.addTestSuite(EntryVersionConsistencyReadThroughTest.class);
suite.addTestSuite(IgniteCacheSyncRebalanceModeSelfTest.class);
- suite.addTestSuite(IgniteCacheConcurrentPutGetRemove.class);
suite.addTest(IgniteCacheReadThroughEvictionsVariationsSuite.suite());
suite.addTestSuite(IgniteCacheTxIteratorSelfTest.class);