Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E90A108A7 for ; Tue, 28 Apr 2015 14:34:43 +0000 (UTC) Received: (qmail 13857 invoked by uid 500); 28 Apr 2015 14:34:43 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 13826 invoked by uid 500); 28 Apr 2015 14:34:43 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 13816 invoked by uid 99); 28 Apr 2015 14:34:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 14:34:43 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 14:34:39 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 58FCD45479 for ; Tue, 28 Apr 2015 14:33:54 +0000 (UTC) Received: (qmail 5672 invoked by uid 99); 28 Apr 2015 14:33:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 14:33:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1624E32BA; Tue, 28 Apr 2015 14:33:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 28 Apr 2015 14:34:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [33/42] incubator-ignite git commit: # ignite-gg-9830 Fixed possible error. X-Virus-Checked: Checked by ClamAV on apache.org # 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 Authored: Tue Apr 28 14:40:56 2015 +0700 Committer: Andrey 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==