#ignite-373: Code formatting.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24e1d006 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24e1d006 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24e1d006 Branch: refs/heads/ignite-373 Commit: 24e1d0061abf63707a4f3680fd4e50838b73dd01 Parents: 2828cb8 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue May 12 13:42:47 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue May 12 13:42:47 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridDistributedCacheAdapter.java | 6 ++++-- .../internal/processors/cache/CacheRemoveAllSelfTest.java | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24e1d006/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index 29a806b..bb7ef1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -328,7 +328,8 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter try { if (!locPart.isEmpty() && locPart.primary(topVer)) { for (GridDhtCacheEntry o : locPart.entries()) { - if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), dht.topology().topologyVersion())) + if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), + dht.topology().topologyVersion())) return false; if (!o.obsoleteOrDeleted()) @@ -341,7 +342,8 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter if (iter != null) { for (Map.Entry<byte[], GridCacheSwapEntry> e : iter) { - if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), dht.topology().topologyVersion())) + if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(), + dht.topology().topologyVersion())) return false; dataLdr.removeDataInternal(ctx.toCacheKeyObject(e.getKey())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24e1d006/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java index 1f2f3f6..10476d7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRemoveAllSelfTest.java @@ -30,9 +30,9 @@ import java.util.concurrent.atomic.*; * Test remove all method. */ public class CacheRemoveAllSelfTest extends GridCacheAbstractSelfTest { - @Override - protected long getTestTimeout() { - return 600000; + /** {@inheritDoc} */ + @Override protected long getTestTimeout() { + return 60000; } /** {@inheritDoc} */
