ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [28/30] ignite git commit: ignite-5075
Date Mon, 29 May 2017 07:18:44 GMT
ignite-5075


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

Branch: refs/heads/ignite-5075-pds
Commit: 32b43db7f56dbc5ce7e3f0b6788a48fbd878cbf2
Parents: 403b848
Author: sboikov <sboikov@gridgain.com>
Authored: Mon May 29 10:11:48 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon May 29 10:11:48 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/affinity/GridAffinityProcessor.java | 2 +-
 .../ignite/internal/processors/cache/GridCacheAffinityManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/32b43db7/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index b137d29..e57cf54 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -395,7 +395,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter {
                     new GridAffinityAssignment(topVer, assign0.assignment(), assign0.idealAssignment());
 
                 AffinityInfo info = new AffinityInfo(
-                    cctx.group().config().getAffinity(),
+                    cctx.config().getAffinity(),
                     cctx.config().getAffinityMapper(),
                     assign,
                     cctx.cacheObjectContext());

http://git-wip-us.apache.org/repos/asf/ignite/blob/32b43db7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index 71df0eb..702b848 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -58,7 +58,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter {
 
     /** {@inheritDoc} */
     @Override public void start0() throws IgniteCheckedException {
-        affFunction = cctx.group().affinityFunction();
+        affFunction = cctx.config().getAffinity();
         affMapper = cctx.config().getAffinityMapper();
 
         aff = cctx.group().affinity();


Mime
View raw message