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 34FFE17A6B for ; Thu, 5 Nov 2015 10:45:01 +0000 (UTC) Received: (qmail 89418 invoked by uid 500); 5 Nov 2015 10:45:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 89367 invoked by uid 500); 5 Nov 2015 10:45:00 -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 89303 invoked by uid 99); 5 Nov 2015 10:45:00 -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; Thu, 05 Nov 2015 10:45:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BAB9E390B; Thu, 5 Nov 2015 10:45:00 +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: <7f51d113a7dc4c709fb484d39a19c7bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-1758 debug Date: Thu, 5 Nov 2015 10:45:00 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1758 bf34693be -> c3962c443 ignite-1758 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c3962c44 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c3962c44 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c3962c44 Branch: refs/heads/ignite-1758 Commit: c3962c44301c80fde6d7829b68dd370a45782932 Parents: bf34693 Author: sboikov Authored: Thu Nov 5 13:44:49 2015 +0300 Committer: sboikov Committed: Thu Nov 5 13:44:49 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c3962c44/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java index 07e15dd..aee3039 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java @@ -117,7 +117,7 @@ abstract class TcpDiscoveryImpl { String msg0 = new SimpleDateFormat("[HH:mm:ss,SSS]").format(new Date(System.currentTimeMillis())) + '[' + Thread.currentThread().getName() + "][" + getLocalNodeId() + - "-" + locNode.internalOrder() + "] " + + "-" + (locNode != null ? locNode.internalOrder() : null) + "] " + msg; debugLog.add(msg0); @@ -132,6 +132,9 @@ abstract class TcpDiscoveryImpl { * @return Local node ID. */ public UUID getLocalNodeId() { + if (spi.locNode == null) + return null; + return spi.locNode.id(); }