ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/25] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Date Thu, 01 Jun 2017 15:44:21 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java


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

Branch: refs/heads/ignite-5075-pds
Commit: eeba611c80e7b63670baf7d4ba05b90d0b86169f
Parents: 5ef6900
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jun 1 11:52:49 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jun 1 11:52:49 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/eeba611c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index afb578b..5990c42 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2066,8 +2066,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         Throwable err
     ) {
         ExchangeActions actions = new ExchangeActions(){
-            @Override List<DynamicCacheChangeRequest> closeRequests(UUID nodeId) {
-                return Collections.singletonList(act.request());
+            @Override List<ActionData> closeRequests(UUID nodeId) {
+                return Collections.singletonList(act);
             }
         };
 
@@ -2135,7 +2135,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                 }
 
                 if (forceClose)
-                    completeCacheStartFuture(req, false, err);
+                    completeCacheStartFuture(req.request(), false, err);
             }
         }
     }


Mime
View raw message