Repository: incubator-ignite Updated Branches: refs/heads/ignite-26-2 90948e67a -> fc9f29466
# IGNITE-26 Created InternalFuture. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc9f2946 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc9f2946 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc9f2946 Branch: refs/heads/ignite-26-2 Commit: fc9f294668321316dc850db9540ee1bb259cbc99 Parents: 90948e6 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Dec 17 20:48:27 2014 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Dec 17 20:48:27 2014 +0300 ---------------------------------------------------------------------- .../gridgain/grid/kernal/GridJobExecuteResponse.java | 12 ++++++------ .../grid/kernal/processors/task/GridTaskWorker.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc9f2946/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java index b605753..aae9cda 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobExecuteResponse.java @@ -41,7 +41,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i /** */ @GridDirectTransient - private IgniteCheckedException gridEx; + private IgniteException gridEx; /** */ private byte[] resBytes; @@ -63,7 +63,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i /** */ @GridToStringExclude @GridDirectTransient - private IgniteCheckedException fakeEx; + private IgniteException fakeEx; /** * No-op constructor to support {@link Externalizable} interface. This @@ -86,7 +86,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i * @param isCancelled Whether job was cancelled or not. */ public GridJobExecuteResponse(UUID nodeId, IgniteUuid sesId, IgniteUuid jobId, byte[] gridExBytes, - IgniteCheckedException gridEx, byte[] resBytes, Object res, byte[] jobAttrsBytes, + IgniteException gridEx, byte[] resBytes, Object res, byte[] jobAttrsBytes, Map<Object, Object> jobAttrs, boolean isCancelled) { assert nodeId != null; assert sesId != null; @@ -142,7 +142,7 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i /** * @return Job exception. */ - @Nullable public IgniteCheckedException getException() { + @Nullable public IgniteException getException() { return gridEx; } @@ -177,14 +177,14 @@ public class GridJobExecuteResponse extends GridTcpCommunicationMessageAdapter i /** * @return Fake exception. */ - public IgniteCheckedException getFakeException() { + public IgniteException getFakeException() { return fakeEx; } /** * @param fakeEx Fake exception. */ - public void setFakeException(IgniteCheckedException fakeEx) { + public void setFakeException(IgniteException fakeEx) { this.fakeEx = fakeEx; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc9f2946/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java index e89502f..16fdf49 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java @@ -1200,7 +1200,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { fakeRes.setFakeException(new ClusterTopologyException("Failed to send job due to node failure: " + node, e)); else - fakeRes.setFakeException(e); + fakeRes.setFakeException(new IgniteException(e)); onResponse(fakeRes); }
