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 71656183E6 for ; Wed, 8 Jul 2015 19:21:59 +0000 (UTC) Received: (qmail 14764 invoked by uid 500); 8 Jul 2015 19:21:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 14729 invoked by uid 500); 8 Jul 2015 19:21:59 -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 14720 invoked by uid 99); 8 Jul 2015 19:21:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 19:21:59 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,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; Wed, 08 Jul 2015 19:19:40 +0000 Received: (qmail 9765 invoked by uid 99); 8 Jul 2015 19:21:27 -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, 08 Jul 2015 19:21:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB6EEDF99B; Wed, 8 Jul 2015 19:21:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 08 Jul 2015 19:21:50 -0000 Message-Id: <46d7e7be026940b99a031750c7cdbd39@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/50] incubator-ignite git commit: GG-10469: Done. X-Virus-Checked: Checked by ClamAV on apache.org GG-10469: Done. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/96fa3002 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96fa3002 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96fa3002 Branch: refs/heads/ignite-1026 Commit: 96fa3002904fcad50dafc1f19655c2d44eaece40 Parents: 96c9695 Author: vozerov-gridgain Authored: Tue Jul 7 18:07:05 2015 +0300 Committer: vozerov-gridgain Committed: Tue Jul 7 18:07:05 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/interop/InteropIgnition.java | 17 ++++++++++++++++- .../ignite/internal/interop/InteropProcessor.java | 7 +++++++ 2 files changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96fa3002/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java index 2989a17..faae72b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java @@ -50,6 +50,9 @@ public class InteropIgnition { */ public static synchronized InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName, int factoryId, long envPtr, long dataPtr) { + if (envPtr <= 0) + throw new IgniteException("Environment pointer must be positive."); + ClassLoader oldClsLdr = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(InteropIgnition.class.getClassLoader()); @@ -83,13 +86,25 @@ public class InteropIgnition { * Get instance by environment pointer. * * @param gridName Grid name. - * @return Instance or {@code null} if it doesn't exists (never started or stopped). + * @return Instance or {@code null} if it doesn't exist (never started or stopped). */ @Nullable public static synchronized InteropProcessor instance(@Nullable String gridName) { return instances.get(gridName); } /** + * Get environment pointer of the given instance. + * + * @param gridName Grid name. + * @return Environment pointer or {@code 0} in case grid with such name doesn't exist. + */ + public static synchronized long environmentPointer(@Nullable String gridName) { + InteropProcessor proc = instance(gridName); + + return proc != null ? proc.environmentPointer() : 0; + } + + /** * Stop single instance. * * @param gridName Grid name, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96fa3002/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java index 325a464..94b733f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java @@ -32,6 +32,13 @@ public interface InteropProcessor { public Ignite ignite(); /** + * Get environment pointer associated with this processor. + * + * @return Environment pointer. + */ + public long environmentPointer(); + + /** * Get stop runnable to perform cleanup when interop is not longer used. *

* NOTE! This runnable is called when current instance of interop processor is eligible for garbage