ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [6/7] incubator-ignite git commit: Merge fixes.
Date Sat, 21 Mar 2015 05:45:05 GMT
Merge fixes.


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

Branch: refs/heads/ignite-45
Commit: a0b4a47031ea39ecf9e432fde8521ca37c685c06
Parents: f1a46c4 6d551b1
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Fri Mar 20 22:34:09 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Fri Mar 20 22:34:09 2015 -0700

----------------------------------------------------------------------
 .../org/apache/ignite/cache/CacheManager.java   |  4 +--
 .../processors/cache/GridCacheProcessor.java    | 32 +++++++++++++++-----
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  6 ++--
 3 files changed, 29 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0b4a470/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 2eb030a,a3ac338..729947b
--- 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
@@@ -1642,10 -1616,10 +1643,10 @@@ public class GridCacheProcessor extend
          Collection<DynamicCacheChangeRequest> sendReqs = new ArrayList<>(reqs.size());
  
          for (DynamicCacheChangeRequest req : reqs) {
-             DynamicCacheStartFuture fut = new DynamicCacheStartFuture(req.cacheName(), req.deploymentId());
+             DynamicCacheStartFuture fut = new DynamicCacheStartFuture(req.cacheName(), req.deploymentId(),
req);
  
              try {
 -                if (req.isStop()) {
 +                if (req.stop()) {
                      DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName()));
  
                      if (desc == null)


Mime
View raw message