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-950 Commit: ae188c708854d62fcd586994b83726e8d1db93b1 Parents: e3750b7 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Tue Jun 16 17:04:45 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> 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);
