ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [5/5] incubator-ignite git commit: ignite-709
Date Mon, 13 Apr 2015 16:50:23 GMT
 ignite-709


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

Branch: refs/heads/ignite-709
Commit: 21f6cb2ef6a0efd0cfe68e0ed231994a81fc07a0
Parents: 042275e
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Mon Apr 13 19:50:10 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Mon Apr 13 19:50:10 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java    | 4 ++--
 .../GridCacheClientModesTcpClientDiscoveryAbstractTest.java | 2 +-
 .../cache/distributed/dht/GridCacheClientOnlySelfTest.java  | 9 +++++----
 .../cache/distributed/near/GridCacheNearOnlySelfTest.java   | 9 +++++----
 4 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21f6cb2e/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 5042745..5245826 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
@@ -3436,7 +3436,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
                                     "messages [locNodeId=" + locNodeId + ", clientNodeId="
+ nodeId + ']');
 
                             processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId,
-                                node.id(), node.order()));
+                                node.id(), node.internalOrder()));
                         }
                     }
                 }
@@ -4345,7 +4345,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements
TcpDiscov
 
                                 if (aliveCheck == 0 && isLocalNodeCoordinator())
{
                                     processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId,
-                                        clientNode.id(), clientNode.order()));
+                                        clientNode.id(), clientNode.internalOrder()));
                                 }
                             }
                         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21f6cb2e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
index 302c389..087fdb3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesTcpClientDiscoveryAbstractTest.java
@@ -60,7 +60,7 @@ public abstract class GridCacheClientModesTcpClientDiscoveryAbstractTest
extends
 
     /** */
     public static class CaseNearCache extends GridCacheClientModesTcpClientDiscoveryAbstractTest
{
-
+        // No-op.
     }
 
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21f6cb2e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java
index 7678c70..24f72a9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheClientOnlySelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -42,7 +43,7 @@ public abstract class GridCacheClientOnlySelfTest extends GridCacheClientModesAb
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.ATOMIC;
+            return ATOMIC;
         }
     }
 
@@ -55,7 +56,7 @@ public abstract class GridCacheClientOnlySelfTest extends GridCacheClientModesAb
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.TRANSACTIONAL;
+            return TRANSACTIONAL;
         }
     }
 
@@ -68,7 +69,7 @@ public abstract class GridCacheClientOnlySelfTest extends GridCacheClientModesAb
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.ATOMIC;
+            return ATOMIC;
         }
     }
 
@@ -81,7 +82,7 @@ public abstract class GridCacheClientOnlySelfTest extends GridCacheClientModesAb
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.TRANSACTIONAL;
+            return TRANSACTIONAL;
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/21f6cb2e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
index 141a09e..f3a62f2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlySelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
@@ -67,7 +68,7 @@ public abstract class GridCacheNearOnlySelfTest extends GridCacheClientModesAbst
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.ATOMIC;
+            return ATOMIC;
         }
     }
 
@@ -80,7 +81,7 @@ public abstract class GridCacheNearOnlySelfTest extends GridCacheClientModesAbst
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.TRANSACTIONAL;
+            return TRANSACTIONAL;
         }
     }
 
@@ -93,7 +94,7 @@ public abstract class GridCacheNearOnlySelfTest extends GridCacheClientModesAbst
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.ATOMIC;
+            return ATOMIC;
         }
     }
 
@@ -106,7 +107,7 @@ public abstract class GridCacheNearOnlySelfTest extends GridCacheClientModesAbst
 
         /** {@inheritDoc} */
         @Override protected CacheAtomicityMode atomicityMode() {
-            return CacheAtomicityMode.TRANSACTIONAL;
+            return TRANSACTIONAL;
         }
     }
 }


Mime
View raw message