# IGNITE-283: Minors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0336d576 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0336d576 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0336d576 Branch: refs/heads/ignite-283-tx Commit: 0336d576075e00f71358f29895284bd2e6c188da Parents: 2945ee4 Author: vozerov <voze...@gridgain.com> Authored: Fri Feb 20 10:01:46 2015 +0300 Committer: vozerov <voze...@gridgain.com> Committed: Fri Feb 20 10:01:46 2015 +0300 ---------------------------------------------------------------------- .../GridDistributedTxRemoteAdapter.java | 4 ++-- .../cache/transactions/IgniteTxLocalAdapter.java | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0336d576/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index ce7a393..f920e04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -512,11 +512,11 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> if (txEntry.ttl() == CU.TTL_ZERO) op = DELETE; - boolean drNeedResolve = cacheCtx.conflictNeedResolve(); + boolean conflictNeedResolve = cacheCtx.conflictNeedResolve(); GridCacheVersionConflictContext<K, V> drCtx = null; - if (drNeedResolve) { + if (conflictNeedResolve) { IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContext<K, V>> drRes = conflictResolve(op, txEntry, val, valBytes, explicitVer, cached); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0336d576/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 aa78a53..e2932f0 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 @@ -741,7 +741,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> V val = res.get2(); byte[] valBytes = res.get3(); - // Deal with DR conflicts. + // Deal with conflicts. GridCacheVersion explicitVer = txEntry.conflictVersion() != null ? txEntry.conflictVersion() : writeVersion(); @@ -762,17 +762,18 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> } } - boolean drNeedResolve = cacheCtx.conflictNeedResolve(); + boolean conflictNeedResolve = cacheCtx.conflictNeedResolve(); GridCacheVersionConflictContext<K, V> conflictCtx = null; - if (drNeedResolve) { + if (conflictNeedResolve) { IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContext<K, V>> - drRes = conflictResolve(op, txEntry, val, valBytes, explicitVer, cached); + conflictRes = conflictResolve(op, txEntry, val, valBytes, explicitVer, + cached); - assert drRes != null; + assert conflictRes != null; - conflictCtx = drRes.get2(); + conflictCtx = conflictRes.get2(); if (conflictCtx.isUseOld()) op = NOOP; @@ -787,7 +788,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> else { assert conflictCtx.isMerge(); - op = drRes.get1(); + op = conflictRes.get1(); val = conflictCtx.mergeValue(); valBytes = null; explicitVer = writeVersion(); @@ -800,8 +801,8 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> // Nullify explicit version so that innerSet/innerRemove will work as usual. explicitVer = null; - if (sndTransformedVals || drNeedResolve) { - assert sndTransformedVals && cacheCtx.isReplicated() || drNeedResolve; + if (sndTransformedVals || conflictNeedResolve) { + assert sndTransformedVals && cacheCtx.isReplicated() || conflictNeedResolve; txEntry.value(val, true, false); txEntry.valueBytes(valBytes);
