flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject flink git commit: [FLINK-3963] AbstractReporter uses wrong ConcurrentHashMap
Date Tue, 24 May 2016 14:04:29 GMT
Repository: flink
Updated Branches:
  refs/heads/master cbee4ef20 -> 5b9872492


[FLINK-3963] AbstractReporter uses wrong ConcurrentHashMap

We should use java.util.concurrent.ConcurrentHashMap because Netty's
ConcurrentHashMap is not available for Hadoop 1. Also, Netty's ConcurrentHashMap
is merely a copy of Java's to support Java versions prior 1.5.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5b987249
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5b987249
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5b987249

Branch: refs/heads/master
Commit: 5b9872492394026f3e6ac31b9937141ebedb1481
Parents: cbee4ef
Author: Maximilian Michels <mxm@apache.org>
Authored: Tue May 24 15:59:19 2016 +0200
Committer: Maximilian Michels <mxm@apache.org>
Committed: Tue May 24 16:03:14 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/flink/metrics/reporter/AbstractReporter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5b987249/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
b/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
index 8e5e2f0..271e91a 100644
--- a/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
+++ b/flink-core/src/main/java/org/apache/flink/metrics/reporter/AbstractReporter.java
@@ -18,12 +18,12 @@
 
 package org.apache.flink.metrics.reporter;
 
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 import org.apache.flink.metrics.Counter;
 import org.apache.flink.metrics.Gauge;
 import org.apache.flink.metrics.Metric;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class AbstractReporter implements MetricReporter {
 	


Mime
View raw message