[10/41] incubator-ignite git commit: Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-futures-cleanup-1

[yzhdanov]

Merge branch 'sprint-2' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into 
ignite-futures-cleanup-1

Conflicts:
        
modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopNoopProcessor.java
        
modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java
        
modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
        
modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.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/cce63fdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cce63fdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cce63fdb

Branch: refs/heads/sprint-2
Commit: cce63fdba2913977de6477a9e5a6a663e3ccc3fd
Parents: 17ac360
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Thu Mar 5 11:16:59 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Thu Mar 5 11:16:59 2015 +0300

----------------------------------------------------------------------
 .../external/HadoopExternalTaskExecutor.java         | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cce63fdb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
index 4b749f3..7fe9d19 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/HadoopExternalTaskExecutor.java
@@ -330,7 +330,7 @@ public class HadoopExternalTaskExecutor extends 
HadoopTaskExecutorAdapter {
 
         HadoopJobId jobId = job.id();
 
-        final HadoopProcessFuture fut = new HadoopProcessFuture(childProcId, 
jobId, ctx.kernalContext());
+        final HadoopProcessFuture fut = new HadoopProcessFuture(childProcId, 
jobId);
 
         final HadoopProcess proc = new HadoopProcess(jobId, fut, 
plan.reducers(ctx.localNodeId()));
 
@@ -853,9 +853,6 @@ public class HadoopExternalTaskExecutor extends 
HadoopTaskExecutorAdapter {
      *
      */
     private class HadoopProcessFuture extends 
GridFutureAdapter<IgniteBiTuple<Process, HadoopProcessDescriptor>> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Child process ID. */
         private UUID childProcId;
 
@@ -878,16 +875,8 @@ public class HadoopExternalTaskExecutor extends 
HadoopTaskExecutorAdapter {
         private final IgniteLogger log = HadoopExternalTaskExecutor.this.log;
 
         /**
-         * Empty constructor.
-         */
-        public HadoopProcessFuture() {
-            // No-op.
-        }
-
-        /**
-         * @param ctx Kernal context.
          */
-        private GridHadoopProcessFuture(UUID childProcId, HadoopJobId jobId, 
GridKernalContext ctx) {
+        private HadoopProcessFuture(UUID childProcId, HadoopJobId jobId) {
             this.childProcId = childProcId;
             this.jobId = jobId;
         }