From c10a73350e9f249ba880bd6a348ced4e8b56f6e5 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Thu, 23 Aug 2012 21:08:19 +0000 Subject: [PATCH] Revert HDFS-3837. Fix DataNode.recoverBlock findbugs warning. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1376701 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 -- .../hdfs/server/protocol/DatanodeRegistration.java | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5cf64bf2f38..f23046f9bee 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -659,8 +659,6 @@ Branch-2 ( Unreleased changes ) HDFS-3830. test_libhdfs_threaded: use forceNewInstance. (Colin Patrick McCabe via eli) - HDFS-3837. Fix DataNode.recoverBlock findbugs warning. (eli) - HDFS-3835. Long-lived 2NN cannot perform a checkpoint if security is enabled and the NN restarts with outstanding delegation tokens. (atm) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeRegistration.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeRegistration.java index cf070b1db09..b736d1280b0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeRegistration.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/DatanodeRegistration.java @@ -88,4 +88,13 @@ public String toString() { + ", storageInfo=" + storageInfo + ")"; } + + @Override + public boolean equals(Object to) { + return super.equals(to); + } + @Override + public int hashCode() { + return super.hashCode(); + } }