ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [07/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.3.3-p3'
Date Wed, 26 Aug 2015 03:06:18 GMT
Merge remote-tracking branch 'remotes/origin/ignite-1.3.3-p3'


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

Branch: refs/heads/ignite-843
Commit: 1a033482cd656546af4a34f703efbbb10f6fe290
Parents: d859587
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Aug 21 11:11:36 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Aug 21 11:11:36 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java       | 10 ++++++++--
 .../cache/distributed/near/GridNearGetFuture.java         |  3 ++-
 .../cache/IgniteCacheTopologySafeGetSelfTest.java         |  7 +++++--
 3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/1a033482/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index f27f356..7adea2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1240,13 +1240,19 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
             false,
             /*can remap*/true
         ).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() {
-            @Override
-            public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException
{
+            @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws
IgniteCheckedException {
                 return e.get().get(key);
             }
         });
     }
 
+    /**
+     * Gets value without waiting for toplogy changes.
+     *
+     * @param key Key.
+     * @return Value.
+     * @throws IgniteCheckedException If failed.
+     */
     public V getTopologySafe(K key) throws IgniteCheckedException {
         String taskName = ctx.kernalContext().job().currentTaskName();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1a033482/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index c4a5d70..951fddf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -787,7 +787,8 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
                 map(keys.keySet(), F.t(node, keys), topVer);
 
                 onDone(Collections.<K, V>emptyMap());
-            } else {
+            }
+            else {
                 final AffinityTopologyVersion updTopVer =
                     new AffinityTopologyVersion(Math.max(topVer.topologyVersion() + 1, cctx.discovery().topologyVersion()));
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/1a033482/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTopologySafeGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTopologySafeGetSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTopologySafeGetSelfTest.java
index ef031f6..7b69674 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTopologySafeGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTopologySafeGetSelfTest.java
@@ -160,10 +160,13 @@ public class IgniteCacheTopologySafeGetSelfTest extends GridCommonAbstractTest
{
         }
     }
 
+    /**
+     * @return Future.
+     * @throws Exception If failed.
+     */
     private IgniteInternalFuture<?> startNodeAsync() throws Exception {
         IgniteInternalFuture<Object> fut = GridTestUtils.runAsync(new Callable<Object>()
{
-            @Override
-            public Object call() throws Exception {
+            @Override public Object call() throws Exception {
                 startGrid(GRID_CNT);
 
                 return null;


Mime
View raw message