IGNITE-2242: Added check for the ConnectorConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05cf1fdd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05cf1fdd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05cf1fdd Branch: refs/heads/ignite-1786 Commit: 05cf1fdd804e54e5c2b703c23cd3f87ac21cfd7b Parents: 8cd80ba Author: isapego <[email protected]> Authored: Mon Jan 18 19:29:49 2016 +0300 Committer: isapego <[email protected]> Committed: Mon Jan 18 19:29:49 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/odbc/protocol/GridTcpOdbcServer.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/05cf1fdd/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/protocol/GridTcpOdbcServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/protocol/GridTcpOdbcServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/protocol/GridTcpOdbcServer.java index 35ac6d6..01e4ef5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/protocol/GridTcpOdbcServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/protocol/GridTcpOdbcServer.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.odbc.protocol; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.OdbcConfiguration; import org.apache.ignite.internal.GridKernalContext; @@ -122,7 +123,12 @@ public class GridTcpOdbcServer { * @throws IOException If failed to resolve host. */ private InetAddress resolveOdbcTcpHost(IgniteConfiguration cfg) throws IOException { - String host = cfg.getConnectorConfiguration().getHost(); + String host = null; + + ConnectorConfiguration connectionCfg = cfg.getConnectorConfiguration(); + + if (connectionCfg != null) + host = connectionCfg.getHost(); if (host == null) host = cfg.getLocalHost();
