ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [37/51] [abbrv] ignite git commit: IGNITE-1282 - Fixed tests after merge from ignite-1.5
Date Mon, 23 Nov 2015 06:39:52 GMT
IGNITE-1282 - Fixed tests after merge from ignite-1.5


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

Branch: refs/heads/ignite-1.5-tx-futs-opts
Commit: 0410f0e596390ee28a1f1535e63030442c557988
Parents: 6d4ecfd
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Fri Nov 20 15:34:57 2015 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Fri Nov 20 15:34:57 2015 +0300

----------------------------------------------------------------------
 .../distributed/dht/GridPartitionedSingleGetFuture.java      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0410f0e5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 32f4e80..f276cac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -49,7 +49,6 @@ import org.apache.ignite.internal.util.typedef.CI1;
 import org.apache.ignite.internal.util.typedef.CIX1;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteProductVersion;
@@ -448,7 +447,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object>
im
      * @param nodeId Node ID.
      * @param res Result.
      */
-    public void onResult(UUID nodeId, GridNearGetResponse res) {
+    @Override public void onResult(UUID nodeId, GridNearGetResponse res) {
         if (!processResponse(nodeId) ||
             !checkError(res.error(), !F.isEmpty(res.invalidPartitions()), res.topologyVersion()))
             return;
@@ -581,10 +580,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object>
im
                 }
                 else {
                     if (!keepCacheObjects) {
-                        Object res = CU.value(val, cctx, true);
-
-                        if (deserializePortable && !skipVals)
-                            res = cctx.unwrapPortableIfNeeded(res, false);
+                        Object res = cctx.unwrapPortableIfNeeded(val, !deserializePortable
&& !skipVals);
 
                         onDone(res);
                     }


Mime
View raw message