From 6685a0a064624a38956e917f5f6d97cc4d271cfd Mon Sep 17 00:00:00 2001
From: Subru Krishnan <subru@apache.org>
Date: Tue, 8 Nov 2016 16:54:19 -0800
Subject: [PATCH] YARN-5833. Addendum patch to fix JDK7 compile issue.

---
 .../org/apache/hadoop/conf/TestConfigurationFieldsBase.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java
index 9007c20ccab..4d143fd9582 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java
@@ -752,7 +752,7 @@ public abstract class TestConfigurationFieldsBase {
           // Check only for numerical values.
           if (StringUtils.isNumeric(ent.getValue())) {
             String crtValue =
-                filteredValues.putIfAbsent(ent.getValue(), ent.getKey());
+                filteredValues.put(ent.getValue(), ent.getKey());
             assertTrue("Parameters " + ent.getKey() + " and " + crtValue +
                 " are using the same default value!", crtValue == null);
           }