IGNITE-1097 Remove duplicated method. (cherry picked from commit 2074f70)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/76515aed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/76515aed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/76515aed Branch: refs/heads/ignite-gg-9615 Commit: 76515aeddd94be7048158c33e6f9a82d03257172 Parents: 2084175 Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Thu Jul 9 17:27:54 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Fri Jul 10 10:47:58 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 40 +------------------- 1 file changed, 1 insertion(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/76515aed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 00fc0f9..1acd49f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -1277,45 +1277,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V /** {@inheritDoc} */ @Override public <T> T invoke(K key, CacheEntryProcessor<K, V, T> entryProcessor, Object... args) throws EntryProcessorException { - try { - CacheOperationContext prev = onEnter(opCtx); - - try { - if (isAsync()) { - IgniteInternalFuture<EntryProcessorResult<T>> fut = delegate.invokeAsync(key, entryProcessor, args); - - IgniteInternalFuture<T> fut0 = fut.chain(new CX1<IgniteInternalFuture<EntryProcessorResult<T>>, T>() { - @Override public T applyx(IgniteInternalFuture<EntryProcessorResult<T>> fut) - throws IgniteCheckedException { - - try { - EntryProcessorResult<T> res = fut.get(); - - return res != null ? res.get() : null; - } - catch (RuntimeException e) { - throw new GridClosureException(e); - } - } - }); - - setFuture(fut0); - - return null; - } - else { - EntryProcessorResult<T> res = delegate.invoke(key, entryProcessor, args); - - return res != null ? res.get() : null; - } - } - finally { - onLeave(prev); - } - } - catch (IgniteCheckedException e) { - throw cacheException(e); - } + return invoke(key, (EntryProcessor<K, V, T>)entryProcessor, args); } /** {@inheritDoc} */
