ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dma...@apache.org
Subject ignite git commit: IGNITE-1911: adjusting some tests
Date Fri, 20 Nov 2015 13:50:32 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-801 e303eded8 -> a8f594e6c


IGNITE-1911: adjusting some tests


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

Branch: refs/heads/ignite-801
Commit: a8f594e6c09485d408b5189d04c2cb5dd9fe8e03
Parents: e303ede
Author: Denis Magda <dmagda@gridgain.com>
Authored: Fri Nov 20 16:50:12 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Fri Nov 20 16:50:12 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java   | 2 +-
 .../apache/ignite/testframework/junits/GridAbstractTest.java   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a8f594e6/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 5014f98..ae3c8cb 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
@@ -2163,7 +2163,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                     final Ignite ignite = spi.ignite();
 
                     if (ignite != null) {
-                        U.error(log, "TcpDiscoverSpi's message worker thread failed abnormally."
+
+                        U.error(log, "TcpDiscoverSpi's message worker thread failed abnormally.
" +
                             "Stopping the grid in order to prevent cluster wide instability.",
e);
 
                         new Thread(new Runnable() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/a8f594e6/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 6f9c559..1fd4cb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -856,7 +856,7 @@ public abstract class GridAbstractTest extends TestCase {
         List<Ignite> ignites = G.allGrids();
 
         for (Ignite g : ignites) {
-            if (g.cluster().localNode().isClient())
+            if (g.configuration().getDiscoverySpi().isClientMode())
                 stopGrid(g.name(), cancel);
         }
     }
@@ -868,7 +868,7 @@ public abstract class GridAbstractTest extends TestCase {
         List<Ignite> ignites = G.allGrids();
 
         for (Ignite g : ignites) {
-            if (!g.cluster().localNode().isClient())
+            if (!g.configuration().getDiscoverySpi().isClientMode())
                 stopGrid(g.name(), cancel);
         }
     }
@@ -2065,4 +2065,4 @@ public abstract class GridAbstractTest extends TestCase {
          */
         public abstract void run(Ignite ignite, IgniteCache<K, V> cache) throws Exception;
     }
-}
\ No newline at end of file
+}


Mime
View raw message