# IGNITE-992 Minor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af120a7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af120a7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af120a7a Branch: refs/heads/ignite-695 Commit: af120a7ac00e5dd3b591b21f17d2f38d6f93668d Parents: eeae5b7 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Jun 10 17:38:28 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Jun 10 17:38:28 2015 +0700 ---------------------------------------------------------------------- .../ignite/internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/internal/visor/util/VisorTaskUtils.java | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af120a7a/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 e977d2e..bd9fb1e 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 @@ -139,7 +139,7 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten } } catch (Exception e) { - return new IgniteBiTuple<>(VisorTaskUtils.wrap(e), null); + return new IgniteBiTuple<>(new VisorExceptionWrapper(e), null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af120a7a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index b0afbc9..6636a08 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -436,6 +436,7 @@ public class VisorTaskUtils { * @param file Starting folder * @param maxDepth Depth of the tree. If 1 - just look in the folder, no sub-folders. * @param filter file filter. + * @return List of found files. */ public static List<VisorLogFile> fileTree(File file, int maxDepth, @Nullable FileFilter filter) { if (file.isDirectory()) { @@ -506,7 +507,7 @@ public class VisorTaskUtils { * * @param f File to process. * @return File charset. - * @throws IOException + * @throws IOException in case of error. */ public static Charset decode(File f) throws IOException { SortedMap<String, Charset> charsets = Charset.availableCharsets(); @@ -735,8 +736,10 @@ public class VisorTaskUtils { * Log message. * * @param log Logger. + * @param msg Message to log. * @param clazz class. * @param start start time. + * @return Time when message was logged. */ public static long log(@Nullable IgniteLogger log, String msg, Class<?> clazz, long start) { final long end = U.currentTimeMillis(); @@ -791,6 +794,7 @@ public class VisorTaskUtils { * * @param args A string array containing the program and its arguments. * @return Started process. + * @throws IOException in case of error. */ public static Process openInConsole(String... args) throws IOException { return openInConsole(null, args); @@ -867,14 +871,4 @@ public class VisorTaskUtils { return bos.toByteArray(); } - - /** - * Wrap throwable object of any type to presented on Visor throwable object. - * - * @param e Base throwable object. - * @return Wrapped throwable object. - */ - public static VisorExceptionWrapper wrap(Throwable e) { - return new VisorExceptionWrapper(e); - } }
