Repository: ignite Updated Branches: refs/heads/ignite-4829 [created] 4121c244f
IGNITE-4829 Fixed issue with lost Spring context. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4121c244 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4121c244 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4121c244 Branch: refs/heads/ignite-4829 Commit: 4121c244ff985792eecc605b0a827c601dc11ea8 Parents: 83579ce Author: Alexey Kuznetsov <[email protected]> Authored: Fri Mar 17 19:01:49 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Mar 17 19:01:49 2017 +0700 ---------------------------------------------------------------------- .../apache/ignite/internal/jdbc2/JdbcConnection.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4121c244/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java index 4244602..3f883e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcConnection.java @@ -219,8 +219,12 @@ public class JdbcConnection implements Connection { ignite = Ignition.start(); } - else - ignite = Ignition.start(loadConfiguration(cfgUrl)); + else { + IgniteBiTuple<IgniteConfiguration, ? extends GridSpringResourceContext> cfgAndCtx = + loadConfiguration(cfgUrl); + + ignite = IgnitionEx.start(cfgAndCtx.get1(), cfgAndCtx.get2()); + } fut.onDone(ignite); } @@ -241,8 +245,9 @@ public class JdbcConnection implements Connection { /** * @param cfgUrl Config URL. + * @return Ignite config and Spring context. */ - private IgniteConfiguration loadConfiguration(String cfgUrl) { + private IgniteBiTuple<IgniteConfiguration, ? extends GridSpringResourceContext> loadConfiguration(String cfgUrl) { try { IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> cfgMap = IgnitionEx.loadConfigurations(cfgUrl); @@ -254,7 +259,7 @@ public class JdbcConnection implements Connection { cfg.setClientMode(true); // Force client mode. - return cfg; + return new IgniteBiTuple<>(cfg, cfgMap.getValue()); } catch (IgniteCheckedException e) { throw new IgniteException(e);
