# 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/8740b6e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8740b6e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8740b6e7 Branch: refs/heads/ignite-695 Commit: 8740b6e76107eeb2885e9454f670044edf11e619 Parents: e934bca Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Jun 9 12:20:23 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Jun 9 12:20:23 2015 +0700 ---------------------------------------------------------------------- .../internal/util/IgniteExceptionRegistry.java | 7 +++---- .../visor/node/VisorNodeSuppressedErrorsTask.java | 12 +++++++++++- .../internal/visor/util/VisorExceptionWrapper.java | 17 ++++++++++------- 3 files changed, 24 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8740b6e7/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 8ad3348..ab113d7 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 @@ -20,7 +20,6 @@ package org.apache.ignite.internal.util; import org.apache.ignite.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.internal.visor.util.*; import java.io.*; import java.util.*; @@ -161,7 +160,7 @@ public class IgniteExceptionRegistry { /** */ @GridToStringExclude - private final VisorExceptionWrapper error; + private final Throwable error; /** */ private final long threadId; @@ -187,7 +186,7 @@ public class IgniteExceptionRegistry { */ public ExceptionInfo(long order, Throwable error, String msg, long threadId, String threadName, long time) { this.order = order; - this.error = new VisorExceptionWrapper(error); + this.error = error; this.threadId = threadId; this.threadName = threadName; this.time = time; @@ -211,7 +210,7 @@ public class IgniteExceptionRegistry { /** * @return Suppressed error. */ - public VisorExceptionWrapper error() { + public Throwable error() { return error; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8740b6e7/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java index 8b39d09..9fc1cc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeSuppressedErrorsTask.java @@ -22,6 +22,7 @@ import org.apache.ignite.internal.processors.task.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.visor.*; +import org.apache.ignite.internal.visor.util.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; @@ -83,12 +84,21 @@ public class VisorNodeSuppressedErrorsTask extends VisorMultiNodeTask<Map<UUID, List<IgniteExceptionRegistry.ExceptionInfo> errors = ignite.context().exceptionRegistry().getErrors(order); + List<IgniteExceptionRegistry.ExceptionInfo> wrapped = new ArrayList<>(errors.size()); + for (IgniteExceptionRegistry.ExceptionInfo error : errors) { if (error.order() > order) order = error.order(); + + wrapped.add(new IgniteExceptionRegistry.ExceptionInfo(error.order(), + new VisorExceptionWrapper(error.error()), + error.message(), + error.threadId(), + error.threadName(), + error.time())); } - return new IgniteBiTuple<>(order, errors); + return new IgniteBiTuple<>(order, wrapped); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8740b6e7/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 e253dcf..d2ae0e1 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 @@ -21,14 +21,17 @@ package org.apache.ignite.internal.visor.util; * Exception wrapper for safe for transferring to Visor. */ public class VisorExceptionWrapper extends Throwable { + /** */ + private static final long serialVersionUID = 0L; + /** Detail message string of this throwable */ private String detailMsg; /** Simple class name of base throwable object. */ - private String classSimpleName; + private String clsSimpleName; /** Class name of base throwable object. */ - private String className; + private String clsName; /** * Wrap throwable by presented on Visor throwable object. @@ -38,8 +41,8 @@ public class VisorExceptionWrapper extends Throwable { public VisorExceptionWrapper(Throwable cause) { assert cause != null; - classSimpleName = cause.getClass().getSimpleName(); - className = cause.getClass().getName(); + clsSimpleName = cause.getClass().getSimpleName(); + clsName = cause.getClass().getName(); detailMsg = cause.getMessage(); @@ -56,14 +59,14 @@ public class VisorExceptionWrapper extends Throwable { * @return Class simple name of base throwable object. */ public String getClassSimpleName() { - return classSimpleName; + return clsSimpleName; } /** * @return Class name of base throwable object. */ public String getClassName() { - return className; + return clsName; } /** {@inheritDoc} */ @@ -73,6 +76,6 @@ public class VisorExceptionWrapper extends Throwable { /** {@inheritDoc} */ @Override public String toString() { - return (detailMsg != null) ? (className + ": " + detailMsg) : className; + return (detailMsg != null) ? (clsName + ": " + detailMsg) : clsName; } }
