# sprint-2 fixed remove
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ab0a5ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ab0a5ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ab0a5ad Branch: refs/heads/ignite-gg-9858 Commit: 0ab0a5adc70107b7f17b5ccd0103be8f9a57f503 Parents: 42ee9ae Author: sboikov <sboi...@gridgain.com> Authored: Mon Mar 16 10:00:25 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Mar 16 10:00:25 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 6 ++++-- .../internal/processors/cache/GridCacheConcurrentMap.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab0a5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 9b1cc57..02501c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4217,9 +4217,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, try { removex(item.getKey()); - } catch (IgniteCheckedException e) { + } + catch (IgniteCheckedException e) { throw new CacheException(e); - } finally { + } + finally { ctx.gate().leave(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ab0a5ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index eb1124f..8c41daa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -1744,7 +1744,7 @@ public class GridCacheConcurrentMap { curVal = null; try { - ((IgniteKernal)ctx.grid()).cache(ctx.name()).remove(e.key(), CU.<K, V>empty()); + ((IgniteKernal)ctx.grid()).cache(ctx.name()).remove(e.key()); } catch (IgniteCheckedException ex) { throw new IgniteException(ex);
