[2/3] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157

[sboikov]

Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
        
modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java


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

Branch: refs/heads/ignite-157
Commit: 419fd60f9cdb020ea5d110d2ae8b42cf1580e152
Parents: 54d1f5f
Author: sboikov <sboi...@gridgain.com>
Authored: Fri Apr 17 12:12:40 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Fri Apr 17 12:12:40 2015 +0300

----------------------------------------------------------------------
 .../distributed/dht/atomic/GridNearAtomicUpdateFuture.java      | 5 +----
 .../processors/datastructures/DataStructuresProcessor.java      | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/419fd60f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 8cd42c1..7521529 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -493,13 +493,10 @@ public class GridNearAtomicUpdateFuture extends 
GridFutureAdapter<Object>
             return;
         }
 
-        if (futVer == null) {
+        if (futVer == null)
             // Assign future version in topology read lock before first 
exception may be thrown.
             futVer = cctx.versions().next(topVer);
 
-            mapTime = U.currentTimeMillis();
-        }
-
         if (!remap && (cctx.config().getAtomicWriteOrderMode() == CLOCK || 
syncMode != FULL_ASYNC))
             cctx.mvcc().addAtomicFuture(version(), this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/419fd60f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index aacac8c..bccb23c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -704,7 +704,7 @@ public final class DataStructuresProcessor extends 
GridProcessorAdapter {
         IgniteClosureX<IgniteInternalTx, GridCacheQueueHeader> rmv =
             new IgniteClosureX<IgniteInternalTx, GridCacheQueueHeader>() {
                 @Override public GridCacheQueueHeader applyx(IgniteInternalTx 
tx) throws IgniteCheckedException {
-                    return (GridCacheQueueHeader)cctx.cache().remove(new 
GridCacheQueueHeaderKey(name), null);
+                    return (GridCacheQueueHeader)cctx.cache().getAndRemove(new 
GridCacheQueueHeaderKey(name));
                 }
             };
 
@@ -1052,7 +1052,7 @@ public final class DataStructuresProcessor extends 
GridProcessorAdapter {
         IgniteClosureX<IgniteInternalTx, GridCacheSetHeader> rmv =
             new IgniteClosureX<IgniteInternalTx, GridCacheSetHeader>() {
                 @Override public GridCacheSetHeader applyx(IgniteInternalTx 
tx) throws IgniteCheckedException {
-                    return (GridCacheSetHeader)cctx.cache().remove(new 
GridCacheSetHeaderKey(name), null);
+                    return (GridCacheSetHeader)cctx.cache().getAndRemove(new 
GridCacheSetHeaderKey(name));
                 }
             };