Repository: incubator-ignite Updated Branches: refs/heads/ignite-nio 43ba8317e -> 6f20eb26e
# sprint-1: Merge changes from sprint-32 + minor cleanup and refactorings of Visor tester. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5993a245 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5993a245 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5993a245 Branch: refs/heads/ignite-nio Commit: 5993a245d6be6a2f85c5630ae8b1eb24e483ee59 Parents: a348f43 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Sat Feb 14 16:45:27 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Sat Feb 14 16:45:27 2015 +0700 ---------------------------------------------------------------------- .../visor/cache/VisorCacheMetricsCollectorTask.java | 10 ++++++---- .../ignite/visor/commands/cache/VisorCacheCommand.scala | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5993a245/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java index 9c18686..a92def6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetricsCollectorTask.java @@ -64,7 +64,8 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT } } - return grpAggrMetrics.values(); + // Create serializable result. + return new ArrayList<>(grpAggrMetrics.values()); } /** @@ -86,9 +87,10 @@ public class VisorCacheMetricsCollectorTask extends VisorMultiNodeTask<IgniteBiT } /** {@inheritDoc} */ - @Override protected Map<String, VisorCacheMetrics> - run(IgniteBiTuple<Boolean, String> arg) { - Collection<? extends GridCache<?, ?>> caches = arg.get1() ? ignite.cachesx() : F.asList(ignite.cachex(arg.get2())); + @Override protected Map<String, VisorCacheMetrics> run(IgniteBiTuple<Boolean, String> arg) { + Collection<? extends GridCache<?, ?>> caches = arg.get1() + ? ignite.cachesx() + : F.asList(ignite.cachex(arg.get2())); if (caches != null) { Map<String, VisorCacheMetrics> res = U.newHashMap(caches.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5993a245/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 0f647ff..1fd989b 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 @@ -467,7 +467,7 @@ class VisorCacheCommand { val nids = prj.nodes().map(_.id()) ignite.compute(prj).execute(classOf[VisorCacheMetricsCollectorTask], toTaskArgument(nids, - new IgniteBiTuple(new JavaBoolean(name.isEmpty), name.orNull))).toList + new IgniteBiTuple(JavaBoolean.valueOf(name.isEmpty), name.orNull))).toList } catch { case e: IgniteException => Nil
