Repository: hadoop Updated Branches: refs/heads/branch-2.6 4c631e8c7 -> 203c7a648
Addendum fix for HDFS-9314 to fix compilation error caused by diamond operator. Change-Id: Ia8b8142c2cd3b5ec413a7da2bf037be64040dc85 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/203c7a64 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/203c7a64 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/203c7a64 Branch: refs/heads/branch-2.6 Commit: 203c7a648b8984c5993b929c80cad61415ceff57 Parents: 4c631e8 Author: Zhe Zhang <[email protected]> Authored: Fri Dec 4 10:57:24 2015 -0800 Committer: Zhe Zhang <[email protected]> Committed: Fri Dec 4 10:57:24 2015 -0800 ---------------------------------------------------------------------- .../hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/203c7a64/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java index 4858bb5..d954566 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java @@ -1019,7 +1019,7 @@ public class BlockPlacementPolicyDefault extends BlockPlacementPolicy { Collection<DatanodeStorageInfo> moreThanOne, Collection<DatanodeStorageInfo> exactlyOne, Map<String, List<DatanodeStorageInfo>> rackMap) { - Collection<DatanodeStorageInfo> ret = new ArrayList<>(); + Collection<DatanodeStorageInfo> ret = new ArrayList<DatanodeStorageInfo>(); if (rackMap.size() == 2) { for (List<DatanodeStorageInfo> dsi : rackMap.values()) { if (dsi.size() >= 2) {
