# ignite-gg-9830 Fixed possible error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/394ec9aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/394ec9aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/394ec9aa Branch: refs/heads/ignite-sprint-4 Commit: 394ec9aad4d93f65c0c87757674aa2650d7ecb71 Parents: d71c00d Author: Andrey <anovi...@gridgain.com> Authored: Tue Apr 28 14:40:56 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Apr 28 14:40:56 2015 +0700 ---------------------------------------------------------------------- .../visor/commands/common/VisorConsoleCommand.scala | 15 +++++++++++++-- .../commands/config/VisorConfigurationCommand.scala | 1 - 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/394ec9aa/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/common/VisorConsoleCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/common/VisorConsoleCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/common/VisorConsoleCommand.scala index f1de4aa..12e3723 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/common/VisorConsoleCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/common/VisorConsoleCommand.scala @@ -19,6 +19,10 @@ package org.apache.ignite.visor.commands.common +import org.apache.ignite.visor.visor.NA + +import scala.collection.JavaConversions._ + /** * Command implementation. */ @@ -70,9 +74,16 @@ trait VisorConsoleCommand { * @param lines Lines to join together. * @return Joined line. */ - protected def join(lines: Iterable[Any]) = { + protected def join(lines: java.lang.Iterable[_ <: Any]) = { + if (lines == null || lines.isEmpty) + NA + else + lines.mkString("[", ", ", "]") + } + + protected def join(lines: Array[_ <: Any]) = { if (lines == null || lines.isEmpty) - null + NA else lines.mkString("[", ", ", "]") } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/394ec9aa/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala index 1f36ff8..3e48302 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala @@ -34,7 +34,6 @@ import org.apache.ignite.internal.visor.util.VisorTaskUtils._ import scala.collection.JavaConversions._ import scala.language.implicitConversions -import scala.util.control.Breaks._ /** * ==Overview==
