Return-Path: <commits-return-100182-archive-asf-public=cust-asf.ponee.io@ignite.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id B099C200BCF
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon,  5 Dec 2016 16:40:36 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id AF2C4160B18; Mon,  5 Dec 2016 15:40:36 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 05632160B09
	for <archive-asf-public@cust-asf.ponee.io>; Mon,  5 Dec 2016 16:40:35 +0100 (CET)
Received: (qmail 10203 invoked by uid 500); 5 Dec 2016 15:40:35 -0000
Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ignite.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ignite.apache.org>
List-Post: <mailto:commits@ignite.apache.org>
List-Id: <commits.ignite.apache.org>
Reply-To: dev@ignite.apache.org
Delivered-To: mailing list commits@ignite.apache.org
Received: (qmail 10190 invoked by uid 99); 5 Dec 2016 15:40:35 -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; Mon, 05 Dec 2016 15:40:35 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id E868EE076F; Mon,  5 Dec 2016 15:40:34 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sboikov@apache.org
To: commits@ignite.apache.org
Message-Id: <4d60583b8edb44498c4da1bd09f2322e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ignite git commit: ignite-1.8 drop
Date: Mon,  5 Dec 2016 15:40:34 +0000 (UTC)
archived-at: Mon, 05 Dec 2016 15:40:36 -0000

Repository: ignite
Updated Branches:
  refs/heads/ignite-1.8-drop2 194934ca6 -> a20d71ca0


ignite-1.8 drop


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a20d71ca
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a20d71ca
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a20d71ca

Branch: refs/heads/ignite-1.8-drop2
Commit: a20d71ca08239ef590b5856d5d55d4c127966c82
Parents: 194934c
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Dec 5 18:40:26 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Dec 5 18:40:26 2016 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/util/future/GridCompoundFuture.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a20d71ca/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index 907c941..f301703 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -192,8 +192,10 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
     @SuppressWarnings("ForLoopReplaceableByForEach")
     public final boolean hasPending() {
         synchronized (sync) {
+            int size = futuresCountNoLock();
+
             // Avoid iterator creation and collection copy.
-            for (int i = 0; i < futuresCount(); i++) {
+            for (int i = 0; i < size; i++) {
                 IgniteInternalFuture<T> fut = future(i);
 
                 if (!fut.isDone())
@@ -297,7 +299,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
     @SuppressWarnings("unchecked")
     protected final IgniteInternalFuture<T> future(int idx) {
         assert Thread.holdsLock(sync);
-        assert futs != null && idx >= 0 && idx < futuresCount();
+        assert futs != null && idx >= 0 && idx < futuresCountNoLock();
 
         if (futs instanceof IgniteInternalFuture) {
             assert idx == 0;