Repository: incubator-ignite Updated Branches: refs/heads/ignite-629 b1faf559f -> 0d9804390
#ignite-629: Fix Javadoc Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0d980439 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0d980439 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0d980439 Branch: refs/heads/ignite-629 Commit: 0d98043908327a9143ab129071940d9663bffec4 Parents: b1faf55 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Mar 27 17:43:21 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Mar 27 17:43:21 2015 +0300 ---------------------------------------------------------------------- .../handlers/cache/GridCacheCommandHandler.java | 6 ++-- .../ignite/scalar/pimps/ScalarCachePimp.scala | 35 -------------------- 2 files changed, 3 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d980439/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index af373a4..00647bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -114,12 +114,12 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { if ((cacheFlagsBits & (1 << 1)) != 0) flagSet.add(CacheFlag.SKIP_SWAP); - if ((cacheFlagsBits & (1 << 4)) != 0) - flagSet.add(CacheFlag.INVALIDATE); - if ((cacheFlagsBits & (1 << 2)) != 0) flagSet.add(CacheFlag.SYNC_COMMIT); + if ((cacheFlagsBits & (1 << 4)) != 0) + flagSet.add(CacheFlag.INVALIDATE); + return flagSet.toArray(new CacheFlag[flagSet.size()]); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0d980439/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala index e9e6de7..01dbef0 100644 --- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala +++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala @@ -213,10 +213,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param kv Key-Value pair to store in cache. * @return `True` if value was stored in cache, `false` otherwise. * @see `IgniteCache#putx(...)` @@ -235,10 +231,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param kv Key-Value pair to store in cache. * @return Previous value associated with specified key, or `null` * if entry did not pass the filter, or if there was no mapping for the key in swap @@ -259,10 +251,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param kv Key-Value pair to store in cache. * @return Previous value associated with specified key as an option. * @see `IgniteCache#put(...)` @@ -289,10 +277,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param kv1 Key-value pair to store in cache. * @param kv2 Key-value pair to store in cache. * @param kvs Optional key-value pairs to store in cache. @@ -319,10 +303,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param kvs Key-value pairs to store in cache. If `null` this function is no-op. * @see `IgniteCache#putAll(...)` */ @@ -341,10 +321,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param ks Sequence of additional keys to remove. If `null` - this function is no-op. * @see `IgniteCache#removeAll(...)` */ @@ -386,10 +362,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param k Key whose mapping is to be removed from cache. * @return Previous value associated with specified key, or `null` * if there was no value for this key. @@ -418,10 +390,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. - * * @param k Key whose mapping is to be removed from cache. * @return Previous value associated with specified key as an option. * @see `IgniteCache#remove(...)` @@ -449,9 +417,6 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] { * This method is transactional and will enlist the entry into ongoing transaction * if there is one. * - * ===Cache Flags=== - * This method is not available if any of the following flags are set on projection: - * `CacheFlag#READ`. * * @param k1 1st key to remove. * @param k2 2nd key to remove.
