You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/25 13:31:25 UTC
[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 <il...@gridgain.com>
Authored: Tue Feb 9 16:14:57 2016 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
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<Integer> 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<Integer> nearValuesIndexes() {
- if (hasNearVal && key != null)
+ if (hasNearVal)
return Collections.singletonList(0);
return null;