You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/10 13:27:20 UTC
incubator-ignite git commit: ignite-471-2: fixing .net
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 19f2b865f -> a989aa09d
ignite-471-2: fixing .net
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a989aa09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a989aa09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a989aa09
Branch: refs/heads/ignite-471-2
Commit: a989aa09da1719359325d639f47296fae8b7d716
Parents: 19f2b86
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jun 10 14:27:11 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jun 10 14:27:11 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/interop/InteropIgnition.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a989aa09/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 d8cc276..77cd2a0 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
@@ -48,11 +48,13 @@ public class InteropIgnition {
* @return Ignite instance.
*/
public static synchronized InteropProcessor start(@Nullable String springCfgPath, @Nullable String gridName,
- int factoryId, long envPtr) {
+ int factoryId, long envPtr) {
IgniteConfiguration cfg = configuration(springCfgPath);
if (gridName != null)
cfg.setGridName(gridName);
+ else
+ gridName = cfg.getGridName();
InteropBootstrap bootstrap = bootstrap(factoryId);