Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 496a65c65 -> e05b21871
IGNITE-45 - Fixed cache stop. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e05b2187 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e05b2187 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e05b2187 Branch: refs/heads/ignite-45 Commit: e05b21871f279e85ae03176ee79f9d1b7a6dd8f0 Parents: 496a65c Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sat Mar 21 04:04:58 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sat Mar 21 04:04:58 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/cache/CacheManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e05b2187/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java index 35658fe..4a41dd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java @@ -257,19 +257,22 @@ public class CacheManager implements javax.cache.CacheManager { @Override public void destroyCache(String cacheName) { kernalGateway.readLock(); + IgniteCache<?, ?> cache; + try { - IgniteCache<?, ?> cache = getCache0(cacheName); + cache = getCache0(cacheName); if (cache != null) { unregisterCacheObject(cacheName, CACHE_CONFIGURATION); unregisterCacheObject(cacheName, CACHE_STATISTICS); - - cache.close(); } } finally { kernalGateway.readUnlock(); } + + if (cache != null) + cache.close(); } /**
