Merge branches 'ignite-639' and 'ignite-sprint-3'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c836dbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c836dbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c836dbe Branch: refs/heads/ignite-30 Commit: 0c836dbeb4c02e834ec7e26f5757cb631f569011 Parents: f600e7e Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 7 11:30:32 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 7 11:30:32 2015 +0700 ---------------------------------------------------------------------- .../processors/query/h2/twostep/GridReduceQueryExecutor.java | 2 +- .../ignite/visor/commands/cache/VisorCacheCommand.scala | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c836dbe/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index 984e2c0..02c7c55 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -47,7 +47,7 @@ import org.h2.value.*; import org.jsr166.*; import javax.cache.*; -import java.lang.reflect.Constructor; +import java.lang.reflect.*; import java.sql.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c836dbe/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index 055931b..df3007c 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala @@ -32,7 +32,6 @@ import java.lang.{Boolean => JavaBoolean} import java.util.{ArrayList => JavaList, Collection => JavaCollection, UUID} import org.apache.ignite.internal.visor.cache._ -import org.apache.ignite.internal.visor.node.{VisorGridConfiguration, VisorNodeConfigurationCollectorTask} import org.apache.ignite.internal.visor.util.VisorTaskUtils._ import scala.collection.JavaConversions._ @@ -494,11 +493,11 @@ class VisorCacheCommand { val nids = prj.nodes().map(_.id()) - val caches = new JavaList[String](1) + val caches: JavaCollection[String] = new JavaList[String](1) name.foreach(caches.add) ignite.compute(prj).execute(classOf[VisorCacheMetricsCollectorTask], toTaskArgument(nids, - new IgniteBiTuple(JavaBoolean.valueOf(systemCaches), caches.asInstanceOf[JavaCollection[String]]))).toList + new IgniteBiTuple(JavaBoolean.valueOf(systemCaches), caches))).toList } catch { case e: IgniteException => Nil @@ -519,7 +518,7 @@ class VisorCacheCommand { case e: IgniteException => scold(e.getMessage) - Collections.emptyList() + null } }
