You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/06/01 13:45:02 UTC
[10/53] [abbrv] incubator-ignite git commit: # IGNITE-943 Fix tests.
# IGNITE-943 Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bb35c881
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bb35c881
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bb35c881
Branch: refs/heads/ignite-sprint-5
Commit: bb35c8814e092b420157a0119dd31104df6093db
Parents: 4117f68
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 27 18:07:00 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 27 18:07:00 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb35c881/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 13b015b..42d9cf9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1744,7 +1744,7 @@ public class IgnitionEx {
}
if (myCfg.isClientMode() == null || !myCfg.isClientMode()) {
- if (myCfg.getDiscoverySpi().isClientMode()) {
+ if (myCfg.getDiscoverySpi() != null && myCfg.getDiscoverySpi().isClientMode()) {
throw new IgniteCheckedException("DiscoverySpi is in client mode, but node is not in client mode" +
"(consider changing 'IgniteConfiguration.clientMode' to 'true').");
}