# ignite-47 Cleanup code. (cherry picked from commit d41ceef)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c799054d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c799054d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c799054d Branch: refs/heads/ignite-422 Commit: c799054de1dcf109a9882a757337aa9b9f43d628 Parents: 6717796 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Sat Mar 7 21:54:45 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Mar 11 18:34:40 2015 +0300 ---------------------------------------------------------------------- .../processors/closure/GridClosureProcessor.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c799054d/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java index 4fb1bdb..1fe0223 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java @@ -590,7 +590,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { ctx.task().setThreadContext(TC_SUBGRID, nodes); - return ctx.task().execute(new T11<>(job, arg), null, false); + return ctx.task().execute(new T11<>(job), arg, false); } finally { busyLock.readUnlock(); @@ -614,7 +614,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { ctx.task().setThreadContext(TC_SUBGRID, nodes); ctx.task().setThreadContext(TC_NO_FAILOVER, true); - return ctx.task().execute(new T11<>(job, arg), null, false); + return ctx.task().execute(new T11<>(job), arg, false); } finally { busyLock.readUnlock(); @@ -1528,7 +1528,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** */ - private class T11<T, R> extends GridPeerDeployAwareTaskAdapter<Void, Collection<R>> + private class T11<T, R> extends GridPeerDeployAwareTaskAdapter<T, Collection<R>> implements GridNoImplicitInjection { /** */ private static final long serialVersionUID = 0L; @@ -1536,22 +1536,17 @@ public class GridClosureProcessor extends GridProcessorAdapter { /** */ private final IgniteClosure<T, R> job; - /** */ - private final T arg; - /** * @param job Job. - * @param arg Job argument. */ - private T11(IgniteClosure<T, R> job, @Nullable T arg) { + private T11(IgniteClosure<T, R> job) { super(U.peerDeployAware(job)); this.job = job; - this.arg = arg; } /** {@inheritDoc} */ - @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable Void arg) { + @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, @Nullable T arg) { if (F.isEmpty(subgrid)) return Collections.emptyMap(); @@ -1559,7 +1554,7 @@ public class GridClosureProcessor extends GridProcessorAdapter { JobMapper mapper = new JobMapper(subgrid.size()); for (ClusterNode n : subgrid) - mapper.map(job(job, this.arg), n); + mapper.map(job(job, arg), n); return mapper.map(); }
