You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/02 13:03:37 UTC
[7/7] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.3.3-p7' into ignite-1.4
Merge remote-tracking branch 'remotes/origin/ignite-1.3.3-p7' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba4a582c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba4a582c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba4a582c
Branch: refs/heads/ignite-1.4
Commit: ba4a582ce19c548475e0f87f5bdedab0d6f4c66c
Parents: 7809d26
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 2 14:01:21 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 2 14:01:21 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ba4a582c/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 57c1977..cf8c8d6 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
@@ -1871,7 +1871,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (!sysCache) {
DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName()));
- if (desc != null && !desc.cancelled() && desc.deploymentId().equals(req.deploymentId())) {
+ if (desc != null && desc.deploymentId().equals(req.deploymentId())) {
Map<UUID, Boolean> nodes = batch.clientNodes().get(name);
assert nodes != null : req;