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:06 UTC
[14/53] [abbrv] incubator-ignite git commit: # ignite-943 minor
# ignite-943 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92b2a57b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92b2a57b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92b2a57b
Branch: refs/heads/ignite-sprint-5
Commit: 92b2a57b040d49536be03e36d0fa69edc9e32771
Parents: 5ecc08e
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed May 27 19:13:07 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed May 27 19:13:07 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/cluster/ClusterNode.java | 2 +-
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +-
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92b2a57b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index 8f56372..85fd08a 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -248,9 +248,9 @@ public interface ClusterNode {
* while topology clients connect to topology in a different way.
*
* @return {@code True} if this node is a client node, {@code false} otherwise.
- * @see DiscoverySpi#isClientMode()
* @see IgniteConfiguration#isClientMode()
* @see Ignition#isClientMode()
+ * @see DiscoverySpi#isClientMode()
*/
public boolean isClient();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92b2a57b/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 42d9cf9..7eb6262 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
@@ -1817,7 +1817,7 @@ public class IgnitionEx {
if (cfg.getDiscoverySpi() == null) {
cfg.setDiscoverySpi(new TcpDiscoverySpi());
- if (cfg.isClientMode() != null && cfg.isClientMode())
+ if (Boolean.TRUE.equals(cfg.isClientMode()))
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setClientMode(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92b2a57b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index d995717..5676fd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1877,5 +1877,4 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
return S.toString(SocketTimeoutObject.class, this);
}
}
-
}