ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Fixed NPE in ServerImpl.cleanIpFinder.
Date Fri, 22 Jan 2016 08:51:26 GMT
Repository: ignite
Updated Branches:
  refs/heads/master eb78b2ab1 -> 74f698478


Fixed NPE in ServerImpl.cleanIpFinder.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74f69847
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74f69847
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74f69847

Branch: refs/heads/master
Commit: 74f69847810c5cfe17cb0b5f1a595540c4d8d080
Parents: eb78b2a
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Jan 22 11:51:12 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Jan 22 11:51:12 2016 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/74f69847/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 471c36b..c69a611 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
@@ -1722,12 +1722,11 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                         if (res == null) {
                             try {
-                                res = pingNode(addr, null, null).get1() != null;
+                                res = pingNode(addr, null, null) != null;
                             }
                             catch (IgniteCheckedException e) {
                                 if (log.isDebugEnabled())
-                                    log.debug("Failed to ping node [addr=" + addr +
-                                        ", err=" + e.getMessage() + ']');
+                                    log.debug("Failed to ping node [addr=" + addr + ", err="
+ e.getMessage() + ']');
 
                                 res = false;
                             }


Mime
View raw message