Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A1EB118987 for ; Thu, 25 Feb 2016 12:31:02 +0000 (UTC) Received: (qmail 99788 invoked by uid 500); 25 Feb 2016 12:31:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 99427 invoked by uid 500); 25 Feb 2016 12:31:02 -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 98203 invoked by uid 99); 25 Feb 2016 12:31:01 -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; Thu, 25 Feb 2016 12:31:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EA8F8E8EFB; Thu, 25 Feb 2016 12:31:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 25 Feb 2016 12:31:25 -0000 Message-Id: <7e30dfee85544635beab0a9ec5ac9e99@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [26/51] [abbrv] ignite git commit: ignite-2523 : Fixed test failures. ignite-2523 : Fixed test failures. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6040f45e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6040f45e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6040f45e Branch: refs/heads/ignite-2523 Commit: 6040f45eae844fd40c113de452e70078dae9a95c Parents: 2f6aff8 Author: Ilya Lantukh Authored: Tue Feb 9 16:14:57 2016 +0300 Committer: Ilya Lantukh Committed: Tue Feb 9 16:14:57 2016 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridNearAtomicSingleUpdateRequest.java | 2 -- .../dht/atomic/GridNearAtomicSingleUpdateResponse.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6040f45e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index e69be07..1e981af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -213,8 +213,6 @@ public class GridNearAtomicSingleUpdateRequest extends GridCacheMessage boolean clientReq, boolean addDepInfo ) { - System.out.println("???"); - assert futVer != null; this.key = key; http://git-wip-us.apache.org/repos/asf/ignite/blob/6040f45e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java index 65dc08e..b3f7e74 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java @@ -291,7 +291,7 @@ public class GridNearAtomicSingleUpdateResponse extends GridCacheMessage impleme * @return Indexes of keys for which update was skipped */ @Override @Nullable public List skippedIndexes() { - if (nearSkip && key != null) + if (nearSkip) return Collections.singletonList(0); return null; @@ -301,7 +301,7 @@ public class GridNearAtomicSingleUpdateResponse extends GridCacheMessage impleme * @return Indexes of keys for which values were generated on primary node. */ @Override @Nullable public List nearValuesIndexes() { - if (hasNearVal && key != null) + if (hasNearVal) return Collections.singletonList(0); return null;