HDFS-10396. Using -diff option with DistCp may get "Comparison method violates its general contract" exception. Contributed by Yongjun Zhang.

(cherry picked from commit 8113855b3a)
This commit is contained in:
Yongjun Zhang 2016-06-28 23:15:13 -07:00
parent d3fc1bddea
commit 8a121dc3b8
1 changed files with 2 additions and 2 deletions

View File

@ -38,8 +38,8 @@ public int compare(DiffInfo d1, DiffInfo d2) {
static final Comparator<DiffInfo> targetComparator = new Comparator<DiffInfo>() { static final Comparator<DiffInfo> targetComparator = new Comparator<DiffInfo>() {
@Override @Override
public int compare(DiffInfo d1, DiffInfo d2) { public int compare(DiffInfo d1, DiffInfo d2) {
return d1.target == null ? -1 : return d1.target == null ? ((d2.target == null)? 0 : -1) :
(d2.target == null ? 1 : d1.target.compareTo(d2.target)); (d2.target == null ? 1 : d1.target.compareTo(d2.target));
} }
}; };