You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2016/06/28 12:20:20 UTC
flink git commit: [hotfix] Remove JavaConversions from TaskManager
Repository: flink
Updated Branches:
refs/heads/master 76ba2d12d -> 6ec9b0fb6
[hotfix] Remove JavaConversions from TaskManager
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6ec9b0fb
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6ec9b0fb
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6ec9b0fb
Branch: refs/heads/master
Commit: 6ec9b0fb6b288d352c69b0fe49a631c9a433d253
Parents: 76ba2d1
Author: Till Rohrmann <tr...@apache.org>
Authored: Tue Jun 28 14:18:49 2016 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Tue Jun 28 14:18:49 2016 +0200
----------------------------------------------------------------------
.../org/apache/flink/runtime/taskmanager/TaskManager.scala | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/6ec9b0fb/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index 1fb0e09..c7ad901 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -72,7 +72,6 @@ import org.apache.flink.runtime.util._
import org.apache.flink.runtime.{FlinkActor, LeaderSessionMessageFilter, LogMessages}
import org.apache.flink.util.{MathUtils, NetUtils}
-import scala.collection.JavaConversions._
import scala.collection.JavaConverters._
import scala.concurrent._
import scala.concurrent.duration._
@@ -1267,7 +1266,7 @@ class TaskManager(
val accumulatorEvents =
scala.collection.mutable.Buffer[AccumulatorSnapshot]()
- runningTasks foreach {
+ runningTasks.asScala foreach {
case (execID, task) =>
val registry = task.getAccumulatorRegistry
val accumulators = registry.getSnapshot
@@ -2305,7 +2304,7 @@ object TaskManager {
private def instantiateGarbageCollectorMetrics(metrics: MetricGroup) {
val garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans
- for (garbageCollector <- garbageCollectors) {
+ for (garbageCollector <- garbageCollectors.asScala) {
val gcGroup = metrics.addGroup("\"" + garbageCollector.getName + "\"")
gcGroup.gauge[Long, FlinkGauge[Long]]("Count", new FlinkGauge[Long] {
override def getValue: Long = garbageCollector.getCollectionCount