Repository: hadoop Updated Branches: refs/heads/branch-2 d3fc1bdde -> 8a121dc3b
HDFS-10396. Using -diff option with DistCp may get "Comparison method violates its general contract" exception. Contributed by Yongjun Zhang. (cherry picked from commit 8113855b3af913e6dcd09626953c64d43168efbd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8a121dc3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8a121dc3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8a121dc3 Branch: refs/heads/branch-2 Commit: 8a121dc3b8294bfdfeaa752cc4323d1fa9658543 Parents: d3fc1bd Author: Yongjun Zhang <[email protected]> Authored: Tue Jun 28 23:15:13 2016 -0700 Committer: Yongjun Zhang <[email protected]> Committed: Tue Jun 28 23:29:48 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/tools/DiffInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8a121dc3/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DiffInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DiffInfo.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DiffInfo.java index 10a8b7e..79bb7fe 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DiffInfo.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DiffInfo.java @@ -38,8 +38,8 @@ class DiffInfo { static final Comparator<DiffInfo> targetComparator = new Comparator<DiffInfo>() { @Override public int compare(DiffInfo d1, DiffInfo d2) { - return d1.target == null ? -1 : - (d2.target == null ? 1 : d1.target.compareTo(d2.target)); + return d1.target == null ? ((d2.target == null)? 0 : -1) : + (d2.target == null ? 1 : d1.target.compareTo(d2.target)); } }; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
