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 656DF1762B for ; Mon, 2 Mar 2015 15:21:00 +0000 (UTC) Received: (qmail 31990 invoked by uid 500); 2 Mar 2015 15:12:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31921 invoked by uid 500); 2 Mar 2015 15:12:47 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 31809 invoked by uid 99); 2 Mar 2015 15:12:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 15:12:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Mar 2015 15:12:44 +0000 Received: (qmail 28297 invoked by uid 99); 2 Mar 2015 15:12:24 -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, 02 Mar 2015 15:12:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F2CBE0FE5; Mon, 2 Mar 2015 15:12:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Mar 2015 15:12:43 -0000 Message-Id: In-Reply-To: <8a38d58f7edd4d9ea753062a662f5c82@git.apache.org> References: <8a38d58f7edd4d9ea753062a662f5c82@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/50] incubator-ignite git commit: #ignite-239: fix logger. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-239: fix logger. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39428532 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39428532 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39428532 Branch: refs/heads/ignite-334 Commit: 39428532fbd3fc402323b7e4580328fcc11cf653 Parents: 535aaf4 Author: ivasilinets Authored: Fri Feb 27 12:23:51 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 12:23:51 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 6 ++++-- .../cache/datastructures/GridCacheQueueCleanupSelfTest.java | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39428532/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index f70836c..32a3d71 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1307,11 +1307,13 @@ public class IgnitionEx { System.setProperty(IGNITE_CONFIG_URL, startCtx.configUrl().toString()); // Initialize factory's log. - IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), cfg.getNodeId()); + UUID nodeId = cfg.getNodeId() != null ? cfg.getNodeId() : UUID.randomUUID(); + + IgniteLogger cfgLog = initLogger(cfg.getGridLogger(), nodeId); assert cfgLog != null; - cfgLog = new GridLoggerProxy(cfgLog, null, name, U.id8(cfg.getNodeId())); + cfgLog = new GridLoggerProxy(cfgLog, null, name, U.id8(nodeId)); log = cfgLog.getLogger(G.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39428532/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java index e61d15b..1192426 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; -import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.datastructures.*;