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/01 19:23:54 UTC
[03/50] 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/e66578ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e66578ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e66578ea
Branch: refs/heads/ignite-218
Commit: e66578ea8fdc14ce25dace68600c2e5317818bad
Parents: bb35c88
Author: sevdokimov <se...@gridgain.com>
Authored: Wed May 27 18:16:59 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Wed May 27 18:16:59 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 ++--
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66578ea/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 46a89aa..2cd8212 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4080,7 +4080,7 @@ class ServerImpl extends TcpDiscoveryImpl {
// Ping.
if (msg instanceof TcpDiscoveryPingRequest) {
- if (!adapter.getSpiContext().isStopping()) {
+ if (!adapter.isNodeStopping0()) {
TcpDiscoveryPingRequest req = (TcpDiscoveryPingRequest)msg;
TcpDiscoveryPingResponse res = new TcpDiscoveryPingResponse(locNodeId);
@@ -4649,7 +4649,7 @@ class ServerImpl extends TcpDiscoveryImpl {
*
*/
public boolean ping() throws InterruptedException {
- if (adapter.getSpiContext().isStopping())
+ if (adapter.isNodeStopping0())
return false;
GridFutureAdapter<Boolean> fut;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e66578ea/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 90ab05a..93a1ec3 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
@@ -1610,6 +1610,13 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
}
/**
+ * @return {@code True} if node is stopping.
+ */
+ boolean isNodeStopping0() {
+ return super.isNodeStopping();
+ }
+
+ /**
* @throws IgniteSpiException If any error occurs.
* @return {@code true} if IP finder contains local address.
*/