You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/18 13:18:50 UTC
ignite git commit: ignite-2590 Unmarshal offheap entry value when key
is enlisted in tx for single 'remove'.
Repository: ignite
Updated Branches:
refs/heads/master 2bb449954 -> 9b5dcfe3f
ignite-2590 Unmarshal offheap entry value when key is enlisted in tx for single 'remove'.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b5dcfe3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b5dcfe3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b5dcfe3
Branch: refs/heads/master
Commit: 9b5dcfe3feba6e3b8d39480b7387bbe6adf04c36
Parents: 2bb4499
Author: sboikov <sb...@gridgain.com>
Authored: Thu Feb 18 15:18:38 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Feb 18 15:18:38 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/9b5dcfe3/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,