You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/30 11:49:50 UTC
[21/50] [abbrv] ignite git commit: Minor compilation fixes in
IgniteCacheProxy for Java 8.
Minor compilation fixes in IgniteCacheProxy for Java 8.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb5e9ebc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb5e9ebc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb5e9ebc
Branch: refs/heads/ignite-3477-master
Commit: cb5e9ebc004102792dbeba9ddb43713ecf4074e2
Parents: 488b25e
Author: devozerov <vo...@gridgain.com>
Authored: Mon Mar 27 15:33:53 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Mar 27 15:33:53 2017 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheProxy.java | 23 +++++++-------------
1 file changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb5e9ebc/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 28cf0db..d36b58c 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
@@ -99,16 +99,6 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
/** */
private static final long serialVersionUID = 0L;
- /** */
- private static final IgniteBiPredicate ACCEPT_ALL = new IgniteBiPredicate() {
- /** */
- private static final long serialVersionUID = -1640538788290240617L;
-
- @Override public boolean apply(Object k, Object v) {
- return true;
- }
- };
-
/** Context. */
private GridCacheContext<K, V> ctx;
@@ -379,9 +369,10 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
try {
if (isAsync()) {
- setFuture(ctx.cache().isLocal() ?
- ctx.cache().localLoadCacheAsync(p, args)
- : ctx.cache().globalLoadCacheAsync(p, args));
+ if (ctx.cache().isLocal())
+ setFuture(ctx.cache().localLoadCacheAsync(p, args));
+ else
+ setFuture(ctx.cache().globalLoadCacheAsync(p, args));
}
else {
if (ctx.cache().isLocal())
@@ -408,8 +399,10 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
CacheOperationContext prev = onEnter(gate, opCtx);
try {
- return (IgniteFuture<Void>)createFuture(ctx.cache().isLocal() ?
- ctx.cache().localLoadCacheAsync(p, args) : ctx.cache().globalLoadCacheAsync(p, args));
+ if (ctx.cache().isLocal())
+ return (IgniteFuture<Void>)createFuture(ctx.cache().localLoadCacheAsync(p, args));
+ else
+ return (IgniteFuture<Void>)createFuture(ctx.cache().globalLoadCacheAsync(p, args));
}
finally {
onLeave(gate, prev);