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 CEE5918417 for ; Wed, 17 Jun 2015 10:45:06 +0000 (UTC) Received: (qmail 46483 invoked by uid 500); 17 Jun 2015 10:45:06 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 46451 invoked by uid 500); 17 Jun 2015 10:45:06 -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 46442 invoked by uid 99); 17 Jun 2015 10:45:06 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 10:45:06 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 5073B182238 for ; Wed, 17 Jun 2015 10:45:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 9WeOaz37uX7h for ; Wed, 17 Jun 2015 10:45:05 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id CFE5D2F14F for ; Wed, 17 Jun 2015 10:44:53 +0000 (UTC) Received: (qmail 45477 invoked by uid 99); 17 Jun 2015 10:44:51 -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, 17 Jun 2015 10:44:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64BB5E3C81; Wed, 17 Jun 2015 10:44:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 17 Jun 2015 10:45:15 -0000 Message-Id: <556af140916844e7af4f23d2206da245@git.apache.org> In-Reply-To: <26ea68dd35634e44b86ea33d72b75e0e@git.apache.org> References: <26ea68dd35634e44b86ea33d72b75e0e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/39] incubator-ignite git commit: Minor correction to interop start procedure: add optional pointer to additional data required for startup Minor correction to interop start procedure: add optional pointer to additional data required for startup Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae188c70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae188c70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae188c70 Branch: refs/heads/ignite-484-1 Commit: ae188c708854d62fcd586994b83726e8d1db93b1 Parents: e3750b7 Author: ptupitsyn Authored: Tue Jun 16 17:04:45 2015 +0300 Committer: ptupitsyn Committed: Tue Jun 16 17:04:45 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/interop/InteropBootstrap.java | 3 ++- .../org/apache/ignite/internal/interop/InteropIgnition.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae188c70/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java index 820bef9..df5af6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropBootstrap.java @@ -28,7 +28,8 @@ public interface InteropBootstrap { * * @param cfg Configuration. * @param envPtr Environment pointer. + * @param dataPtr Optional pointer to additional data required for startup. * @return Ignite node. */ - public InteropProcessor start(IgniteConfiguration cfg, long envPtr); + public InteropProcessor start(IgniteConfiguration cfg, long envPtr, long dataPtr); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae188c70/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 96639cd..fb0d6e1 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 @@ -45,10 +45,11 @@ public class InteropIgnition { * @param gridName Grid name. * @param factoryId Factory ID. * @param envPtr Environment pointer. + * @param dataPtr Optional pointer to additional data required for startup. * @return Ignite instance. */ public static synchronized InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName, - int factoryId, long envPtr) { + int factoryId, long envPtr, long dataPtr) { IgniteConfiguration cfg = configuration(springCfgPath); if (gridName != null) @@ -58,7 +59,7 @@ public class InteropIgnition { InteropBootstrap bootstrap = bootstrap(factoryId); - InteropProcessor proc = bootstrap.start(cfg, envPtr); + InteropProcessor proc = bootstrap.start(cfg, envPtr, dataPtr); trackFinalization(proc);