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/02/02 15:16:55 UTC
[03/43] incubator-ignite git commit: ignite-86 review
ignite-86 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7db90e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7db90e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7db90e6
Branch: refs/heads/ignite-26
Commit: c7db90e636a1a2c6c8258aa9d9397d6277a641f0
Parents: 173726f
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Jan 21 20:47:33 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Jan 21 20:47:33 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheDeploymentManager.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7db90e6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java
index 58fe292..17a116e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java
@@ -212,7 +212,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
for (GridCacheContext<K, V> cacheCtx : cctx.cacheContexts()) {
// Unwind immediately for local and replicate caches.
// We go through preloader for proper synchronization.
- if (cacheCtx.isLocal() || cacheCtx.isReplicated())
+ if (cacheCtx.isLocal())
cacheCtx.preloader().unwindUndeploys();
}
}
@@ -275,7 +275,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
}
}));
- Collection<K> keys = new LinkedList<>();
+ Collection<K> keys = new ArrayList<>();
for (K k : keySet)
keys.add(k);
@@ -298,19 +298,20 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap
cacheCtx.near().dht().context().swap().onUndeploy(leftNodeId, ldr) :
cacheCtx.swap().onUndeploy(leftNodeId, ldr);
- if (keys.size() == 0 || cacheCtx.system())
+ if (cacheCtx.system())
continue;
U.quietAndWarn(log, "");
U.quietAndWarn(
log,
- "Cleared all cache entries for undeployed class loader [[cacheName=" + cacheCtx.namexx() +
+ "Cleared all cache entries for undeployed class loader [cacheName=" + cacheCtx.namexx() +
", undeployCnt=" + keys.size() + ", swapUndeployCnt=" + swapUndeployCnt +
", clsLdr=" + ldr.getClass().getName() + ']',
"Cleared all cache entries for undeployed class loader for cache: " + cacheCtx.namexx());
U.quietAndWarn(
log,
- " ^-- Cache auto-undeployment happens in SHARED deployment mode (to turn off, switch to CONTINUOUS mode)");
+ " ^-- Cache auto-undeployment happens in SHARED deployment mode " +
+ "(to turn off, switch to CONTINUOUS mode)");
U.quietAndWarn(log, "");
}