# ignite-609 Fixed message.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19b05bf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19b05bf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19b05bf2 Branch: refs/heads/ignite-424 Commit: 19b05bf2a82cb6165af22304daab90ce03ed3520 Parents: 23ea878 Author: anovikov <anovi...@gridgain.com> Authored: Fri Mar 27 13:36:12 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Fri Mar 27 13:36:12 2015 +0700 ---------------------------------------------------------------------- .../ignite/visor/commands/VisorConsole.scala | 4 ++-- .../visor/commands/start/VisorStartCommand.scala | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19b05bf2/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala index 7dd7ff8..569320c 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala @@ -323,7 +323,7 @@ private[commands] class VisorFileNameCompleter extends Completer { else if (left.count(_ == '\'') % 2 == 1) "\'" else "" - val splitterSz = quote.size + " ".size + val splitterSz = quote.length + " ".length // path begin marker index. ixBegin = left.lastIndexOf(" " + quote) @@ -347,7 +347,7 @@ private[commands] class VisorFileNameCompleter extends Completer { if (dir != null && dir.listFiles != null) { val files = for (file <- dir.listFiles if file.getName.startsWith(partOfName)) yield file - if (files.size == 1) { + if (files.length == 1) { val candidate = files(0) candidates.add(candidate.getName + (if (candidate.isDirectory) separator else " ")) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19b05bf2/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala index 0dac9dd..5342fc1 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala @@ -19,14 +19,13 @@ package org.apache.ignite.visor.commands.start import org.apache.ignite._ import org.apache.ignite.internal.util.{IgniteUtils => U} - -import java.io._ -import java.util.concurrent._ - import org.apache.ignite.visor.VisorTag import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable} import org.apache.ignite.visor.visor._ +import java.io._ +import java.util.concurrent._ + import scala.collection.JavaConversions._ import scala.language.{implicitConversions, reflectiveCalls} import scala.util.control.Breaks._ @@ -310,7 +309,15 @@ class VisorStartCommand { errT #= ("Host", "Error") - res.filter(!_.ok) foreach (r => { errT += (r.host, r.errMsg.replace("\t", " ").split(U.nl()).toSeq) }) + val ue = "java.lang.UnsupportedOperationException: " + + res.filter(!_.ok).groupBy(r => r).foreach { + case (r, _) if r.errMsg.lines.next().startsWith(ue) => + errT += (r.host, r.errMsg.lines.next().replace(ue, "")) + + case (r, _) => + errT += (r.host, r.errMsg.replace("\t", " ").split(U.nl()).toSeq) + } errT.render() }
