ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [32/32] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4705
Date Mon, 20 Feb 2017 12:27:34 GMT
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4705

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aeae0627
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aeae0627
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aeae0627

Branch: refs/heads/ignite-4705
Commit: aeae06273b7abd6d3402f401f287e35cd92fb3be
Parents: e0ed94f
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Feb 20 15:26:54 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Feb 20 15:26:54 2017 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java       | 6 +++++-
 .../distributed/dht/atomic/GridNearAtomicMappingResponse.java  | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/aeae0627/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 0bacc2a..d3b0f5d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -3240,7 +3240,11 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
         GridCacheVersion ver = req.writeVersion();
 
         GridDhtAtomicNearResponse nearRes = ctx.config().getWriteSynchronizationMode() ==
FULL_SYNC ?
-            new GridDhtAtomicNearResponse(req.partition(), ctx.cacheId(), req.nearFutureId(),
req.dhtNodes(), req.flags()) : null;
+            new GridDhtAtomicNearResponse(ctx.cacheId(),
+                req.partition(),
+                req.nearFutureId(),
+                req.dhtNodes(),
+                req.flags()) : null;
 
         boolean replicate = ctx.isDrEnabled();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/aeae0627/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMappingResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMappingResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMappingResponse.java
index be1f0f5..6dd33ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMappingResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMappingResponse.java
@@ -61,8 +61,6 @@ public class GridNearAtomicMappingResponse extends GridCacheMessage {
      * @param mapping Mapping.
      */
     GridNearAtomicMappingResponse(int cacheId, int part, long futId, List<UUID> mapping)
{
-        assert part >= 0 : part;
-
         this.cacheId = cacheId;
         this.part = part;
         this.futId = futId;


Mime
View raw message