ignite-2412
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 717f65d..5707b49 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
@@ -2202,8 +2202,10 @@
* @param filter Optional filter.
* @return Put operation future.
*/
- public IgniteInternalFuture<V> getAndPutAsync0(final K key, final V val,
- @Nullable final CacheEntryPredicate filter) {
+ public IgniteInternalFuture<V> getAndPutAsync0(final K key,
+ final V val,
+ @Nullable final CacheEntryPredicate filter)
+ {
return asyncOp(new AsyncOp<V>() {
@Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx, AffinityTopologyVersion readyTopVer) {
return tx.putAsync(ctx, readyTopVer, key, val, true, filter)
@@ -3071,7 +3073,7 @@
/** {@inheritDoc} */
@Override public final IgniteInternalFuture<Boolean> removeAsync(final K key, final V val) {
- A.notNull(key, "key");
+ A.notNull(key, "val");
return removeAsync(key, ctx.equalsVal(val));
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 1e8a26d..07b9dad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -740,7 +740,7 @@
false,
true,
UPDATE,
- false).chain(RET2NULL).get();
+ false).get();
}
/** {@inheritDoc} */
@@ -1084,6 +1084,7 @@
* @param retval Return value required flag.
* @param rawRetval Return {@code GridCacheReturn} instance.
* @param waitTopFut Whether to wait for topology future.
+ * @param async Async operation flag.
* @return Completion future.
*/
@SuppressWarnings("ConstantConditions")
@@ -1200,6 +1201,7 @@
* @param retval Return value flag.
* @param filter Filter.
* @param waitTopFut Whether to wait for topology future.
+ * @param async Async operation flag.
* @return Future.
*/
private IgniteInternalFuture update0(
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 452efe8..a26d2f3 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
@@ -1468,7 +1468,7 @@
* @return Future.
*/
@SuppressWarnings("unchecked")
- protected IgniteInternalFuture asyncOp(final Callable<?> op) {
+ private IgniteInternalFuture asyncOp(final Callable<?> op) {
IgniteInternalFuture fail = asyncOpAcquire();
if (fail != null)
