diff --git a/CHANGES.txt b/CHANGES.txt
index 22bdb94c2b..eba3b6f39c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -451,6 +451,8 @@ Release 0.22.0 - Unreleased
 
     HADOOP-7089. Fix link resolution logic in hadoop-config.sh. (eli)
 
+    HADOOP-7046. Fix Findbugs warning in Configuration. (Po Cheung via shv)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS
diff --git a/src/java/org/apache/hadoop/conf/Configuration.java b/src/java/org/apache/hadoop/conf/Configuration.java
index e5d4a15acc..6b7df16694 100644
--- a/src/java/org/apache/hadoop/conf/Configuration.java
+++ b/src/java/org/apache/hadoop/conf/Configuration.java
@@ -1591,7 +1591,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
   public void writeXml(Writer out) throws IOException {
     Document doc = asXmlDocument();
 
-    Properties properties = getProps();
     try {
       DOMSource source = new DOMSource(doc);
       StreamResult result = new StreamResult(out);
diff --git a/src/test/test-patch.properties b/src/test/test-patch.properties
index 46bfd0cb43..acb3997cc0 100644
--- a/src/test/test-patch.properties
+++ b/src/test/test-patch.properties
@@ -14,5 +14,5 @@
 # limitations under the License.
 
 OK_RELEASEAUDIT_WARNINGS=1
-OK_FINDBUGS_WARNINGS=1
+OK_FINDBUGS_WARNINGS=0
 OK_JAVADOC_WARNINGS=6