#ignite-683: Move method putx0 in GridCacheAdapter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4ca07ba2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ca07ba2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ca07ba2 Branch: refs/heads/ignite-218 Commit: 4ca07ba28df86947a329e9a81ba657b92e7ec35a Parents: 2a19cd9 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 13 12:12:13 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 13 12:12:13 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 52 ++++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ca07ba2/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 426994b..d07a83c 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 @@ -1991,32 +1991,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return prevVal; } - /** - * @param key Key. - * @param val Value. - * @param filter Optional filter. - * @return Previous value. - * @throws IgniteCheckedException If failed. - */ - public boolean putx0(final K key, final V val, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { - A.notNull(key, "key", val, "val"); - - if (keyCheck) - validateCacheKey(key); - - validateCacheValue(val); - - return syncOp(new SyncOp<Boolean>(true) { - @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { - return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).get().success(); - } - - @Override public String toString() { - return "put [key=" + key + ", val=" + val + ", filter=" + Arrays.toString(filter) + ']'; - } - }); - } - /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val) { return putAsync(key, val, CU.empty0()); @@ -2067,6 +2041,32 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, }); } + /** + * @param key Key. + * @param val Value. + * @param filter Optional filter. + * @return Previous value. + * @throws IgniteCheckedException If failed. + */ + public boolean putx0(final K key, final V val, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { + A.notNull(key, "key", val, "val"); + + if (keyCheck) + validateCacheKey(key); + + validateCacheValue(val); + + return syncOp(new SyncOp<Boolean>(true) { + @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException { + return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).get().success(); + } + + @Override public String toString() { + return "put [key=" + key + ", val=" + val + ", filter=" + Arrays.toString(filter) + ']'; + } + }); + } + /** {@inheritDoc} */ @Override public boolean putx(final K key, final V val) throws IgniteCheckedException { return putx(key, val, CU.empty0());