diff options
| author | Tsz-wo Sze <szetszwo@apache.org> | 2013-04-22 22:13:58 +0000 |
|---|---|---|
| committer | Tsz-wo Sze <szetszwo@apache.org> | 2013-04-22 22:13:58 +0000 |
| commit | 43bdc22e9207a74678665de5f109dd7e56fe979a (patch) | |
| tree | 09076a9ae6b9b0986637c084cc621748c285f4b9 /hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/Diff.java | |
| parent | cb229db4bd9d26d6d98bef57ce9d6a94d0977594 (diff) | |
HDFS-4726. Fix test failures after merging the INodeId-INode mapping from trunk. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470735 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/Diff.java')
| -rw-r--r-- | hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/Diff.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/Diff.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/Diff.java index b8ec5cacee..dee082e700 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/Diff.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/Diff.java @@ -261,7 +261,7 @@ public class Diff<K, E extends Diff.Element<K>> { public UndoInfo<E> modify(final E oldElement, final E newElement) { Preconditions.checkArgument(oldElement != newElement, "They are the same object: oldElement == newElement = %s", newElement); - Preconditions.checkArgument(oldElement.equals(newElement), + Preconditions.checkArgument(oldElement.compareTo(newElement.getKey()) == 0, "The names do not match: oldElement=%s, newElement=%s", oldElement, newElement); final int c = search(created, newElement.getKey()); |