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 988D71859E for ; Mon, 27 Apr 2015 02:27:38 +0000 (UTC) Received: (qmail 60677 invoked by uid 500); 27 Apr 2015 02:27:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 60610 invoked by uid 500); 27 Apr 2015 02:27:38 -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 60517 invoked by uid 99); 27 Apr 2015 02:27:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 02:27:38 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 02:27:33 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 5824F2603B for ; Mon, 27 Apr 2015 02:26:49 +0000 (UTC) Received: (qmail 59812 invoked by uid 99); 27 Apr 2015 02:26:49 -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, 27 Apr 2015 02:26:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F240DE0061; Mon, 27 Apr 2015 02:26:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 27 Apr 2015 02:27:02 -0000 Message-Id: <95d651cae5ad43c38e825d399a744c81@git.apache.org> In-Reply-To: <981359481a1c4215bcbd952b009d135f@git.apache.org> References: <981359481a1c4215bcbd952b009d135f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/18] incubator-ignite git commit: ignite-766 X-Virus-Checked: Checked by ClamAV on apache.org ignite-766 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4a37d799 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4a37d799 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4a37d799 Branch: refs/heads/ignite-gg-9830 Commit: 4a37d79930e74c0b9ff887056f8e8c578ec4f013 Parents: b4b28fd Author: avinogradov Authored: Fri Apr 24 18:47:10 2015 +0300 Committer: avinogradov Committed: Fri Apr 24 18:47:10 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/IgniteUtils.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a37d799/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 901274d..cb56650 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -3952,6 +3952,8 @@ public abstract class IgniteUtils { throws MalformedObjectNameException { SB sb = new SB(JMX_DOMAIN + ':'); + appendClassLoaderHash(sb); + appendJvmId(sb); if (gridName != null && !gridName.isEmpty()) @@ -3968,12 +3970,20 @@ public abstract class IgniteUtils { /** * @param sb Sb. */ + private static void appendClassLoaderHash(SB sb) { + String clsLdrHash = Integer.toHexString(Ignite.class.getClassLoader().hashCode()); + + sb.a("clsLdr=").a(clsLdrHash).a(','); + } + + /** + * @param sb Sb. + */ private static void appendJvmId(SB sb) { - if (getBoolean(IGNITE_MBEAN_APPEND_JVM_ID)) { - String gridId = Integer.toHexString(Ignite.class.getClassLoader().hashCode()) + "_" - + ManagementFactory.getRuntimeMXBean().getName(); + if (getBoolean(IGNITE_MBEAN_APPEND_JVM_ID)){ + String jvmId = ManagementFactory.getRuntimeMXBean().getName(); - sb.a("jvmId=").a(gridId).a(','); + sb.a("jvmId=").a(jvmId).a(','); } } @@ -4001,6 +4011,8 @@ public abstract class IgniteUtils { throws MalformedObjectNameException { SB sb = new SB(JMX_DOMAIN + ':'); + appendClassLoaderHash(sb); + appendJvmId(sb); if (gridName != null && !gridName.isEmpty())