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 E1200182AF for ; Wed, 30 Dec 2015 09:35:38 +0000 (UTC) Received: (qmail 70832 invoked by uid 500); 30 Dec 2015 09:35:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70797 invoked by uid 500); 30 Dec 2015 09:35:38 -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 70788 invoked by uid 99); 30 Dec 2015 09:35:38 -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; Wed, 30 Dec 2015 09:35:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7D5A5E01F4; Wed, 30 Dec 2015 09:35:38 +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: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-1.5 debug Date: Wed, 30 Dec 2015 09:35:38 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1537 345656560 -> 3268a0a73 ignite-1.5 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3268a0a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3268a0a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3268a0a7 Branch: refs/heads/ignite-1537 Commit: 3268a0a73b343b0201127017237d121c8f8166d7 Parents: 3456565 Author: sboikov Authored: Wed Dec 30 12:26:45 2015 +0300 Committer: sboikov Committed: Wed Dec 30 12:28:43 2015 +0300 ---------------------------------------------------------------------- .../near/GridNearTxFinishFuture.java | 31 ++++++++++---------- .../ignite/stream/socket/SocketStreamer.java | 3 +- 2 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3268a0a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index e0c20e4..20582e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -717,7 +717,7 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu /** * @param nodeId Node ID. - * @return {@code True} future processed node failure. + * @return {@code True} if future processed node failure. */ abstract boolean onNodeLeft(UUID nodeId); @@ -931,36 +931,35 @@ public final class GridNearTxFinishFuture extends GridCompoundIdentityFutu /** {@inheritDoc} */ @Override boolean onNodeLeft(UUID nodeId) { - boolean done; - - boolean ret; - - synchronized (this) { - ret = nodes.remove(nodeId); - - done = nodes.isEmpty(); - } - - if (done) - onDone(tx); - - return ret; + return onResponse(nodeId); } /** * @param nodeId Node ID. */ void onDhtFinishResponse(UUID nodeId) { + onResponse(nodeId); + } + + /** + * @param nodeId Node ID. + * @return {@code True} if processed node response. + */ + private boolean onResponse(UUID nodeId) { boolean done; + boolean ret; + synchronized (this) { - nodes.remove(nodeId); + ret = nodes.remove(nodeId); done = nodes.isEmpty(); } if (done) onDone(tx); + + return ret; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/3268a0a7/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java index 066a5fd..21204c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java +++ b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java @@ -204,7 +204,8 @@ public class SocketStreamer extends StreamAdapter { * Stops streamer. */ public void stop() { - srv.stop(); + if (srv != null) + srv.stop(); if (log.isDebugEnabled()) log.debug("Socket streaming server stopped");