Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10249 46f5e608b -> b739765af
# IGNITE-992 Review. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea12580d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea12580d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea12580d Branch: refs/heads/ignite-gg-10249 Commit: ea12580dabd60dc0c2b1a0e86d7112b409366ba7 Parents: 662f733 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Jun 9 10:15:41 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Jun 9 10:15:41 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/internal/util/IgniteExceptionRegistry.java | 2 +- .../internal/visor/node/VisorNodeDataCollectorTask.java | 8 ++++---- .../apache/ignite/internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/internal/visor/util/VisorExceptionWrapper.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea12580d/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java index a56570a..8ad3348 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteExceptionRegistry.java @@ -187,7 +187,7 @@ public class IgniteExceptionRegistry { */ public ExceptionInfo(long order, Throwable error, String msg, long threadId, String threadName, long time) { this.order = order; - this.error = VisorTaskUtils.wrap(error); + this.error = new VisorExceptionWrapper(error); this.threadId = threadId; this.threadName = threadName; this.time = time; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea12580d/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java index 7dbfd39..3b2d45c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorTask.java @@ -88,7 +88,7 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData else { // Ignore nodes that left topology. if (!(unhandledEx instanceof ClusterGroupEmptyException)) - taskRes.unhandledEx().put(nid, VisorTaskUtils.wrap(unhandledEx)); + taskRes.unhandledEx().put(nid, new VisorExceptionWrapper(unhandledEx)); } } } @@ -117,13 +117,13 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData taskRes.events().addAll(jobRes.events()); if (jobRes.eventsEx() != null) - taskRes.eventsEx().put(nid, VisorTaskUtils.wrap(jobRes.eventsEx())); + taskRes.eventsEx().put(nid, new VisorExceptionWrapper(jobRes.eventsEx())); if (!jobRes.caches().isEmpty()) taskRes.caches().put(nid, jobRes.caches()); if (jobRes.cachesEx() != null) - taskRes.cachesEx().put(nid, VisorTaskUtils.wrap(jobRes.cachesEx())); + taskRes.cachesEx().put(nid, new VisorExceptionWrapper(jobRes.cachesEx())); if (!jobRes.igfss().isEmpty()) taskRes.igfss().put(nid, jobRes.igfss()); @@ -132,6 +132,6 @@ public class VisorNodeDataCollectorTask extends VisorMultiNodeTask<VisorNodeData taskRes.igfsEndpoints().put(nid, jobRes.igfsEndpoints()); if (jobRes.igfssEx() != null) - taskRes.igfssEx().put(nid, VisorTaskUtils.wrap(jobRes.igfssEx())); + taskRes.igfssEx().put(nid, new VisorExceptionWrapper(jobRes.igfssEx())); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea12580d/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java index 82555cc..e977d2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java @@ -112,7 +112,7 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten if (meta == null) return new IgniteBiTuple<>( - VisorTaskUtils.wrap(new SQLException("Fail to execute query. No metadata available.")), null); + new VisorExceptionWrapper(new SQLException("Fail to execute query. No metadata available.")), null); else { List<VisorQueryField> names = new ArrayList<>(meta.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea12580d/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java index be6f63c..a2965d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorExceptionWrapper.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.visor.util; /** - * Wrapper of exceptions for transferring to Visor with absent exception classes. + * Exception wrapper for safe for transferring to Visor. */ public class VisorExceptionWrapper extends Throwable { /** Detail message string of this throwable */
