ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Date Tue, 25 Jul 2017 15:10:08 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578


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

Branch: refs/heads/ignite-5578
Commit: ccf6a6bf45bf763b13f6c036a0fa676acb2767c4
Parents: e11355a 3019433
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Jul 25 11:20:58 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Jul 25 11:20:58 2017 +0300

----------------------------------------------------------------------
 .../configuration/CacheConfiguration.java       |  5 --
 .../apache/ignite/internal/IgniteKernal.java    |  8 +--
 .../ignite/internal/MarshallerContextImpl.java  |  4 +-
 .../affinity/GridAffinityProcessor.java         |  2 +-
 .../cache/CacheAffinitySharedManager.java       |  8 +--
 .../binary/CacheObjectBinaryProcessorImpl.java  |  5 --
 .../dht/GridClientPartitionTopology.java        | 11 ++--
 .../cache/distributed/dht/GridDhtGetFuture.java | 14 ++---
 .../dht/atomic/GridDhtAtomicCache.java          |  2 +-
 .../cache/local/GridLocalLockFuture.java        |  5 --
 .../freelist/io/PagesListMetaIO.java            |  2 +-
 .../cache/transactions/IgniteTxHandler.java     | 66 ++++++++++----------
 .../cache/transactions/IgniteTxManager.java     |  2 +-
 .../processors/igfs/IgfsDataManager.java        |  2 +-
 .../string/GridRedisIncrDecrCommandHandler.java |  2 +-
 .../ignite/internal/util/IgniteUtils.java       | 16 ++---
 .../ignite/internal/util/nio/GridNioServer.java | 14 +++--
 .../cache/VisorCacheMetricsCollectorTask.java   |  2 +-
 .../communication/tcp/TcpCommunicationSpi.java  | 25 ++++++--
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  2 +-
 .../spi/failover/always/AlwaysFailoverSpi.java  |  2 +-
 .../apache/ignite/mesos/ClusterProperties.java  |  4 +-
 .../cache/websession/WebSessionFilter.java      |  2 +-
 23 files changed, 104 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ccf6a6bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 37bfa8a,0f46a90..5d243ea
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@@ -1511,9 -1360,9 +1511,9 @@@ public class CacheAffinitySharedManager
          for (int i = 0; i < fetchFuts.size(); i++) {
              GridDhtAssignmentFetchFuture fetchFut = fetchFuts.get(i);
  
-             Integer grpId = fetchFut.groupId();
+             int grpId = fetchFut.groupId();
  
 -            fetchAffinity(fut.topologyVersion(),
 +            fetchAffinity(topVer,
                  fut.discoveryEvent(),
                  fut.discoCache(),
                  cctx.cache().cacheGroup(grpId).affinity(),


Mime
View raw message