You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/06/16 12:37:43 UTC
incubator-ignite git commit: # wip
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-dotnetclientmode f4b112347 -> 2026034b0
# wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2026034b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2026034b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2026034b
Branch: refs/heads/ignite-gg-dotnetclientmode
Commit: 2026034b008a161781838d71f64cf1d4063e9b64
Parents: f4b1123
Author: ptupitsyn <pt...@gridgain.com>
Authored: Tue Jun 16 13:24:28 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
Committed: Tue Jun 16 13:24:28 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/interop/InteropBootstrap.java | 2 +-
.../org/apache/ignite/internal/interop/InteropIgnition.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2026034b/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..56c0da5 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
@@ -30,5 +30,5 @@ public interface InteropBootstrap {
* @param envPtr Environment pointer.
* @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/2026034b/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..444a964 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
@@ -42,13 +42,12 @@ public class InteropIgnition {
* Start Ignite node in interop mode.
*
* @param springCfgPath Spring configuration path.
- * @param gridName Grid name.
* @param factoryId Factory ID.
* @param envPtr Environment pointer.
* @return Ignite instance.
*/
public static synchronized InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName,
- int factoryId, long envPtr) {
+ int factoryId, long dataPtr, long envPtr) {
IgniteConfiguration cfg = configuration(springCfgPath);
if (gridName != null)
@@ -58,7 +57,7 @@ public class InteropIgnition {
InteropBootstrap bootstrap = bootstrap(factoryId);
- InteropProcessor proc = bootstrap.start(cfg, envPtr);
+ InteropProcessor proc = bootstrap.start(cfg, envPtr, dataPtr);
trackFinalization(proc);