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/04/08 18:04:45 UTC
[4/5] incubator-ignite git commit: #ignite-683: Delete unused
argument in getAllAsync.
#ignite-683: Delete unused argument in getAllAsync.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8fce2af1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8fce2af1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8fce2af1
Branch: refs/heads/ignite-683
Commit: 8fce2af18701f0b618ea23c1462371962ba566b7
Parents: 06cc5d8
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Apr 8 18:45:40 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Apr 8 18:45:40 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 3 ---
.../processors/cache/distributed/dht/GridDhtCacheAdapter.java | 1 -
.../processors/cache/local/atomic/GridLocalAtomicCache.java | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fce2af1/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 e26b619..cb29c9b 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
@@ -1704,7 +1704,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return getAllAsync(keys,
true,
- entry,
!skipTx,
subjId,
taskName,
@@ -1717,7 +1716,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
/**
* @param keys Keys.
* @param readThrough Read through.
- * @param cached Cached.
* @param checkTx Check tx.
* @param subjId Subj Id.
* @param taskName Task name.
@@ -1730,7 +1728,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
*/
public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable final Collection<? extends K> keys,
boolean readThrough,
- @Nullable GridCacheEntryEx cached,
boolean checkTx,
@Nullable final UUID subjId,
final String taskName,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fce2af1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 99c7ddd..c2984e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -520,7 +520,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
) {
return getAllAsync(keys,
true,
- null,
/*don't check local tx. */false,
subjId,
taskName,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fce2af1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 66a8d7a..ba87017 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -571,7 +571,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
if (success || !storeEnabled)
return vals;
- return getAllAsync(keys, true, null, false, subjId, taskName, deserializePortable, false, expiry, skipVals)
+ return getAllAsync(keys, true, false, subjId, taskName, deserializePortable, false, expiry, skipVals)
.get();
}