IGNITE-45 - Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6d551b11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d551b11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d551b11 Branch: refs/heads/ignite-45 Commit: 6d551b11434b87612294d2f06be00af23fb9b3a2 Parents: c9c4f63 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 20 22:30:48 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 20 22:30:48 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6d551b11/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 a943624..a3ac338 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 @@ -1540,8 +1540,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { DynamicCacheDescriptor desc = registeredCaches.get(maskNull(cacheName)); - U.debug(log, "Requested to start cache [localNodeId=" + ctx.localNodeId() + ", name=" + cacheName + ", desc=" + desc + ']'); - DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(ctx.localNodeId()); if (ccfg != null) { @@ -1646,8 +1644,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (old != null) { if (req.isStart() && !req.clientStartOnly()) { - U.debug(log, "!!! Future collision (will fail) [old=" + old + ", req=" + req + ']'); - fut.onDone(new IgniteCacheExistsException("Failed to start cache " + "(a cache with the same name is already being started or stopped): " + req.cacheName())); } @@ -2503,15 +2499,10 @@ public class GridCacheProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public boolean onDone(@Nullable Object res, @Nullable Throwable err) { + // Make sure to remove future before completion. pendingFuts.remove(maskNull(cacheName), this); - if (super.onDone(res, err)) { - U.debug(log, "Completed future: " + this); - - return true; - } - - return false; + return super.onDone(res, err); } /** {@inheritDoc} */
