Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 73F8318B59 for ; Fri, 1 Jan 2016 21:07:29 +0000 (UTC) Received: (qmail 57006 invoked by uid 500); 1 Jan 2016 21:07:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 56889 invoked by uid 500); 1 Jan 2016 21:07:29 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 56675 invoked by uid 99); 1 Jan 2016 21:07:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jan 2016 21:07:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBE23E0CBC; Fri, 1 Jan 2016 21:07:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Fri, 01 Jan 2016 21:07:38 -0000 Message-Id: <2181d72849c44c9b944f173673f89b41@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/18] ignite git commit: IGNITE-2263: DANGEROUS! view() to first() in GridDhtForceKeysFuture. IGNITE-2263: DANGEROUS! view() to first() in GridDhtForceKeysFuture. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2aed6aef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2aed6aef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2aed6aef Branch: refs/heads/ignite-2263 Commit: 2aed6aeff546cd6fcab5baede5ab1cb499b513df Parents: 5be6f6a Author: thatcoach Authored: Fri Jan 1 17:03:45 2016 +0300 Committer: thatcoach Committed: Fri Jan 1 17:03:45 2016 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtForceKeysFuture.java | 35 +++++++++----------- .../ignite/internal/util/lang/GridFunc.java | 19 +++++++++++ 2 files changed, 35 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2aed6aef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java index 6b03131..dcae189 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java @@ -17,16 +17,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.preloader; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; @@ -54,14 +44,21 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.apache.ignite.events.EventType.EVT_CACHE_REBALANCE_OBJECT_LOADED; -import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; -import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; -import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.MOVING; -import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.OWNING; -import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE; -import static org.apache.ignite.internal.processors.dr.GridDrType.DR_PRELOAD; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; + +import static java.util.concurrent.TimeUnit.*; +import static org.apache.ignite.events.EventType.*; +import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; +import static org.apache.ignite.internal.processors.dr.GridDrType.*; /** * Force keys request future. @@ -360,7 +357,7 @@ public final class GridDhtForceKeysFuture extends GridCompoundFuture T first(@Nullable Iterable c, IgnitePredicate pred) { + if (c == null) + return null; + + for (T next : c) { + if (pred.apply(next)) + return next; + } + + return null; + } + + /** * Gets first element from given list or returns {@code null} if list is empty. * * @param list List.