ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [5/6] ignite git commit: ignite-gg-12389
Date Tue, 04 Jul 2017 09:15:16 GMT
ignite-gg-12389


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

Branch: refs/heads/ignite-gg-12389
Commit: a9e1753b6a8e4cafff43799ee94aa337748f39cc
Parents: c3f6344
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Jul 4 10:38:52 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Jul 4 10:38:52 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheSharedContext.java      | 1 +
 .../cache/persistence/IgniteCacheSnapshotManager.java          | 6 ++++--
 .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a9e1753b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 32a2bce..eeec9c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -322,6 +322,7 @@ public class GridCacheSharedContext<K, V> {
     }
 
     /**
+     * @param active Active flag.
      * @throws IgniteCheckedException If failed.
      */
     void onReconnected(boolean active) throws IgniteCheckedException {

http://git-wip-us.apache.org/repos/asf/ignite/blob/a9e1753b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheSnapshotManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheSnapshotManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheSnapshotManager.java
index 7dd93f7..657e782 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheSnapshotManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheSnapshotManager.java
@@ -116,7 +116,7 @@ public class IgniteCacheSnapshotManager extends GridCacheSharedManagerAdapter
im
         FullPageId fullId,
         PageMemory pageMem
     ) throws IgniteCheckedException {
-
+        // No-op.
     }
 
     /**
@@ -127,13 +127,15 @@ public class IgniteCacheSnapshotManager extends GridCacheSharedManagerAdapter
im
         ByteBuffer pageBuf,
         Integer tag
     ) throws IgniteCheckedException {
-
+        // No-op.
     }
 
+    /** {@inheritDoc} */
     @Override public void onActivate(GridKernalContext kctx) throws IgniteCheckedException
{
         // No-op.
     }
 
+    /** {@inheritDoc} */
     @Override public void onDeActivate(GridKernalContext kctx) {
         // No-op.
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/a9e1753b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index b469c07..0bc1239 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -484,7 +484,7 @@ class ClientImpl extends TcpDiscoveryImpl {
 
         long startTime = U.currentTimeMillis();
 
-        DiscoveryDataPacket discoveryData = spi.collectExchangeData(new DiscoveryDataPacket(getLocalNodeId()));
+        DiscoveryDataPacket discoveryData = recon ? null : spi.collectExchangeData(new DiscoveryDataPacket(getLocalNodeId()));
 
         while (true) {
             if (Thread.currentThread().isInterrupted())


Mime
View raw message