Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/in…

…cubator-ignite into ignite-24 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java
apache · Jan 27, 2015 · b910a4c · b910a4c
1 parent 8bef53e
commit b910a4c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...s/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/...s/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1177,8 +1177,7 @@ private void send(
         boolean ordered,
         long timeout,
         boolean skipOnTimeout
-    )
-        throws IgniteCheckedException {
+    ) throws IgniteCheckedException {
         assert nodes != null;
         assert topic != null;
         assert msg != null;

diff --git a/...gnite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/...gnite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -569,6 +569,8 @@ public Object topic(long idx) {
          */
         private Set<Integer> demandFromNode(ClusterNode node, final long topVer, GridDhtPartitionDemandMessage<K, V> d,
             GridDhtPartitionsExchangeFuture<K, V> exchFut) throws InterruptedException, IgniteCheckedException {
+            GridDhtPartitionTopology<K, V> top = cctx.dht().topology();
+
             cntr++;
 
             d.topic(topic(cntr));
@@ -690,7 +692,7 @@ private Set<Integer> demandFromNode(ClusterNode node, final long topVer, GridDht
                             int p = e.getKey();
 
                             if (cctx.affinity().localNode(p, topVer)) {
-                                GridDhtLocalPartition<K, V> part = cctx.dht().topology().localPartition(p, topVer, true);
+                                GridDhtLocalPartition<K, V> part = top.localPartition(p, topVer, true);
 
                                 assert part != null;
 
@@ -734,7 +736,7 @@ private Set<Integer> demandFromNode(ClusterNode node, final long topVer, GridDht
                                         if (last) {
                                             remaining.remove(p);
 
-                                            cctx.dht().topology().own(part);
+                                            top.own(part);
 
                                             if (log.isDebugEnabled())
                                                 log.debug("Finished preloading partition: " + part);

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -60,7 +60,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
     private final IgniteMarshaller marsh;
 
     /** */
-    public final ConcurrentMap<IgniteUuid, GridTaskWorker<?, ?>> tasks = GridConcurrentFactory.newMap();
+    private final ConcurrentMap<IgniteUuid, GridTaskWorker<?, ?>> tasks = GridConcurrentFactory.newMap();
 
     /** */
     private boolean stopping;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -27,7 +27,6 @@
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.job.*;
 import org.apache.ignite.internal.processors.timeout.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;