Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2747E200C61 for ; Tue, 25 Apr 2017 09:04:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 25BA7160BB6; Tue, 25 Apr 2017 07:04:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7570B160B9E for ; Tue, 25 Apr 2017 09:04:17 +0200 (CEST) Received: (qmail 85969 invoked by uid 500); 25 Apr 2017 07:04:16 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 85956 invoked by uid 99); 25 Apr 2017 07:04:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2017 07:04:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 784D7E049A; Tue, 25 Apr 2017 07:04:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 25 Apr 2017 07:04:16 -0000 Message-Id: <9bdbeba6be7444e7952d85d19b43233b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: Fixed AtomicSequence test archived-at: Tue, 25 Apr 2017 07:04:18 -0000 Repository: ignite Updated Branches: refs/heads/ignite-5009 6f9735fa9 -> 7d9aa1c1b Fixed AtomicSequence test Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26c222bd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26c222bd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26c222bd Branch: refs/heads/ignite-5009 Commit: 26c222bd46e5fc725c2ad20815078792298d7869 Parents: b41ecd1 Author: Dmitriy Govorukhin Authored: Mon Apr 24 20:20:41 2017 +0300 Committer: Alexey Goncharuk Committed: Mon Apr 24 20:20:41 2017 +0300 ---------------------------------------------------------------------- .../datastructures/GridCacheAtomicReferenceImpl.java | 2 ++ .../internal/IgniteClientReconnectAtomicsTest.java | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/26c222bd/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java index 0b0c202..d6fa2ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java @@ -166,6 +166,8 @@ public final class GridCacheAtomicReferenceImpl implements GridCacheAtomicRef /** {@inheritDoc} */ @Override public boolean compareAndSet(final T expVal, final T newVal) { + checkRemoved(); + try { if (ctx.dataStructures().knownType(expVal) && ctx.dataStructures().knownType(newVal)) { EntryProcessorResult res = http://git-wip-us.apache.org/repos/asf/ignite/blob/26c222bd/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java index 4622fff..00daf5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java @@ -31,6 +31,7 @@ import org.apache.ignite.IgniteCountDownLatch; import org.apache.ignite.IgniteLock; import org.apache.ignite.IgniteSemaphore; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearLockResponse; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse; import org.apache.ignite.testframework.GridTestUtils; /** @@ -363,7 +364,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr BlockTcpCommunicationSpi servCommSpi = commSpi(srv); - servCommSpi.blockMessage(GridNearLockResponse.class); + servCommSpi.blockMessage(GridNearTxPrepareResponse.class); final IgniteInternalFuture fut = GridTestUtils.runAsync(new Callable() { @Override public Object call() throws Exception { @@ -396,8 +397,6 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue((Boolean)fut.get(2, TimeUnit.SECONDS)); // Check that after reconnect working. - assertEquals("3st value", clientAtomicRef.get()); - assertTrue(clientAtomicRef.compareAndSet("3st value", "4st value")); assertEquals("4st value", clientAtomicRef.get()); assertEquals("4st value", srvAtomicRef.get()); @@ -523,7 +522,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr BlockTcpCommunicationSpi servCommSpi = commSpi(srv); - servCommSpi.blockMessage(GridNearLockResponse.class); + servCommSpi.blockMessage(GridNearTxPrepareResponse.class); final IgniteInternalFuture fut = GridTestUtils.runAsync(new Callable() { @Override public Object call() throws Exception { @@ -556,7 +555,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue((Boolean)fut.get(2, TimeUnit.SECONDS)); // Check that after reconnect working. - assertEquals(true, clientAtomicStamped.compareAndSet(2, 3, 2, 3)); + assertEquals(false, clientAtomicStamped.compareAndSet(2, 3, 2, 3)); assertEquals(3, clientAtomicStamped.value()); assertEquals(3, clientAtomicStamped.stamp()); @@ -655,7 +654,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr final IgniteAtomicLong srvAtomicLong = srv.atomicLong("atomicLongInProggress", 0, false); - commSpi.blockMessage(GridNearLockResponse.class); + commSpi.blockMessage(GridNearTxPrepareResponse.class); final IgniteInternalFuture fut = GridTestUtils.runAsync(new Callable() { @Override public Object call() throws Exception { @@ -688,8 +687,8 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue((Boolean)fut.get(2, TimeUnit.SECONDS)); // Check that after reconnect working. - assertEquals(1, clientAtomicLong.addAndGet(1)); - assertEquals(2, srvAtomicLong.addAndGet(1)); + assertEquals(2, clientAtomicLong.addAndGet(1)); + assertEquals(3, srvAtomicLong.addAndGet(1)); clientAtomicLong.close(); }