ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [1/3] incubator-ignite git commit: # ignite-283: Minors.
Date Wed, 18 Feb 2015 13:39:43 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-283 9c296cd80 -> e09ff8611


# 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/055a3802
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/055a3802
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/055a3802

Branch: refs/heads/ignite-283
Commit: 055a38022dcbc613e3c65c9cb46ba3f83683686d
Parents: 9c296cd
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Feb 18 13:33:35 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Feb 18 13:33:35 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/GridDistributedTxRemoteAdapter.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/055a3802/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 9c1d85f..7dccf8c 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,14 +512,14 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K,
V>
 
                                     boolean drNeedResolve = cacheCtx.conflictNeedResolve();
 
-                                        if (drNeedResolve) {
-                                            IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContext<K,
V>>
-                                                drRes = conflictResolve(op, txEntry.key(),
val, valBytes,
-                                                txEntry.ttl(), txEntry.conflictExpireTime(),
explicitVer, cached);
+                                    if (drNeedResolve) {
+                                        IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContext<K,
V>>
+                                            drRes = conflictResolve(op, txEntry.key(), val,
valBytes,
+                                            txEntry.ttl(), txEntry.conflictExpireTime(),
explicitVer, cached);
 
                                         assert drRes != null;
 
-                                            GridCacheVersionConflictContext<K, V> drCtx
= drRes.get2();
+                                        GridCacheVersionConflictContext<K, V> drCtx
= drRes.get2();
 
                                         if (drCtx.isUseOld())
                                             op = NOOP;


Mime
View raw message