Repository: incubator-ignite Updated Branches: refs/heads/ignite-41 956bac743 -> 32643c1cc
# ignite-41 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/32643c1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/32643c1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/32643c1c Branch: refs/heads/ignite-41 Commit: 32643c1cc2b66ff8d049e59cb37d7515e26ac601 Parents: 956bac7 Author: sboikov <[email protected]> Authored: Tue Dec 23 09:47:35 2014 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 23 09:47:35 2014 +0300 ---------------------------------------------------------------------- .../gridgain/grid/kernal/processors/cache/GridCacheAdapter.java | 3 +-- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 +-- .../grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java | 1 - .../GridCacheExpiredEntriesPreloadAbstractSelfTest.java | 1 - .../near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java | 1 - .../near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java | 3 +-- 6 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32643c1c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 0246d36..f55ee0e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -525,7 +525,6 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im } /** - * * @param keys Keys to lock. * @param timeout Lock timeout. * @param tx Transaction. @@ -533,7 +532,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im * @param retval Flag to return value. * @param isolation Transaction isolation. * @param invalidate Invalidate flag. - * @param filter TTL for read operation. + * @param accessTtl TTL for read operation. * @param filter Optional filter. * @return Locks future. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32643c1c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 3d09222..2c988e7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -271,8 +271,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { final ExpiryPolicy expiryPlc = prj != null ? prj.expiry() : null; return asyncOp(new CO<IgniteFuture<Map<K, V>>>() { - @Override - public IgniteFuture<Map<K, V>> apply() { + @Override public IgniteFuture<Map<K, V>> apply() { return getAllAsync0(keys, false, forcePrimary, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32643c1c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java index e0ebe84..89ee812 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java @@ -22,7 +22,6 @@ import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import javax.cache.expiry.*; -import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.gridgain.grid.cache.GridCacheMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32643c1c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java index 81ade22..0afad8c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java @@ -20,7 +20,6 @@ import org.gridgain.testframework.*; import javax.cache.expiry.*; import java.util.*; -import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.gridgain.grid.cache.GridCachePreloadMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32643c1c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index b66ab89..9cdb629 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -17,7 +17,6 @@ import org.gridgain.grid.util.typedef.internal.*; import javax.cache.expiry.*; import java.util.*; -import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/32643c1c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java index 0bf8000..4923e16 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearOnlyMultiNodeFullApiSelfTest.java @@ -14,10 +14,9 @@ import org.gridgain.grid.util.typedef.*; import javax.cache.expiry.*; import java.util.*; -import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.ATOMIC; +import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheDistributionMode.*; /**
