You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by yj...@apache.org on 2016/06/29 06:23:49 UTC
hadoop git commit: HDFS-10396. Using -diff option with DistCp may get
"Comparison method violates its general contract" exception. Contributed by
Yongjun Zhang.
Repository: hadoop
Updated Branches:
refs/heads/trunk 26b5e6116 -> 8113855b3
HDFS-10396. Using -diff option with DistCp may get "Comparison method violates its general contract" exception. Contributed by Yongjun Zhang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8113855b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8113855b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8113855b
Branch: refs/heads/trunk
Commit: 8113855b3af913e6dcd09626953c64d43168efbd
Parents: 26b5e61
Author: Yongjun Zhang <yz...@cloudera.com>
Authored: Tue Jun 28 23:15:13 2016 -0700
Committer: Yongjun Zhang <yz...@cloudera.com>
Committed: Tue Jun 28 23:15:13 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/8113855b/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org