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 2014/12/30 13:12:01 UTC
[16/18] incubator-ignite git commit: ignite-44
ignite-44
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71b0b812
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71b0b812
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71b0b812
Branch: refs/heads/ignite-1
Commit: 71b0b81264c80c00327b89b8f44dd390a10005aa
Parents: 1600e5c
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 29 17:00:19 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 29 17:00:19 2014 +0300
----------------------------------------------------------------------
.../processors/cache/transactions/IgniteTxLocalAdapter.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b0b812/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 6380605..7f86472 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -2259,7 +2259,9 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
if (!F.isEmptyOrNulls(filter) && !F.isAlwaysTrue(filter))
retval = true;
- if (retval || txEntry.op() == TRANSFORM) {
+ boolean invoke = txEntry.op() == TRANSFORM;
+
+ if (retval || invoke) {
if (!cacheCtx.isNear()) {
try {
if (!hasPrevVal)
@@ -2268,8 +2270,8 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V>
/*read-through*/true,
/*failFast*/false,
/*unmarshal*/true,
- /*metrics*/true,
- /*event*/!dht(),
+ /*metrics*/!invoke,
+ /*event*/!invoke && !dht(),
/*temporary*/false,
CU.subjectId(this, cctx),
null,