ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-2590 Unmarshal offheap entry value when key is enlisted in tx.
Date Thu, 18 Feb 2016 08:42:02 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2590 [created] f33e8f1bf


ignite-2590 Unmarshal offheap entry value when key is enlisted in tx.


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

Branch: refs/heads/ignite-2590
Commit: f33e8f1bf2c2faf0048fca474dab26ac7c948aca
Parents: 2bb4499
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Feb 18 11:41:44 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Feb 18 11:41:44 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxLocalAdapter.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f33e8f1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index a999358..f35e2e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -2542,7 +2542,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements
Ig
                                 T2<CacheObject, GridCacheVersion> res = primaryLocal(entry)
?
                                     entry.innerGetVersioned(this,
                                         /*swap*/false,
-                                        /*unmarshal*/retval,
+                                        /*unmarshal*/retval || needVal,
                                         /*metrics*/retval,
                                         /*events*/retval,
                                         CU.subjectId(this, cctx),
@@ -2561,7 +2561,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements
Ig
                                     /*swap*/false,
                                     /*read-through*/false,
                                     /*fail-fast*/false,
-                                    /*unmarshal*/retval,
+                                    /*unmarshal*/retval || needVal,
                                     /*metrics*/retval,
                                     /*events*/retval,
                                     /*temporary*/false,


Mime
View raw message