ignite-gg-8.0.2.ea2 fix IgniteCacheP2pUnmarshallingErrorTest.testResp…

…onseMessageOnUnmarshallingFailed and IgniteCacheClientQueryReplicatedNodeRestartSelfTest.testRestarts
apache · Jan 13, 2017 · e1b84b4 · e1b84b4
1 parent 2254d37
commit e1b84b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
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
@@ -2180,7 +2180,7 @@ protected final <K1, V1> IgniteInternalFuture<Map<K1, V1>> getAllAsync0(
                         ctx.evicts().touch(peekEx(key0), topVer);
                 }
 
-                throw e;
+                return new GridFinishedFuture<>(e);
             }
             catch (IgniteCheckedException e) {
                 return new GridFinishedFuture<>(e);

diff --git a/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -573,9 +573,8 @@ private Object innerGet0(
                 val = this.val;
 
                 if (val == null) {
-                    if (isStartVersion()) {
+                    if (isStartVersion())
                         val = unswap(true, false);
-                    }
                 }
 
                 if (val != null) {

diff --git a/...ng/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/...ng/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -79,16 +79,15 @@ public H2TreeIndex(
 
         name = BPlusTree.treeName(name, "H2Tree");
 
-        if (!cctx.kernalContext().clientNode()) {
+        if (!cctx.kernalContext().clientNode() && cctx.affinityNode()) {
             IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database();
 
             RootPage page = cctx.offheap().rootPageForIndex(name);
 
             tree = new H2Tree(name, cctx.offheap().reuseListForIndex(name), cctx.cacheId(),
                 dbMgr.pageMemory(), cctx.shared().wal(), cctx.offheap().globalRemoveId(),
                 tbl.rowFactory(), page.pageId().pageId(), page.isAllocated()) {
-                @Override
-                protected int compare(BPlusIO<SearchRow> io, ByteBuffer buf, int idx, SearchRow row)
+                @Override protected int compare(BPlusIO<SearchRow> io, ByteBuffer buf, int idx, SearchRow row)
                     throws IgniteCheckedException {
                     return compareRows(getRow(io, buf, idx), row);
                 }