svn commit: r1199571 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/core/org/apache/hadoop/conf/Configuration.java

[szetszwo]

Author: szetszwo
Date: Wed Nov  9 00:41:57 2011
New Revision: 1199571

URL: http://svn.apache.org/viewvc?rev=1199571&view=rev
Log:
HADOOP-7664. Remove warmings when overriding final parameter configuration if 
the override value is same as the final parameter value.  Contributed by Ravi 
Prakash

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/conf/Configuration.java

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1199571&r1=1199570&r2=1199571&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Nov  9 00:41:57 
2011
@@ -88,6 +88,10 @@ Release 0.20.205.1 - unreleased
     HADOOP-5124. A few optimizations to FsNamesystem#RecentInvalidateSets.
     (Hairong Kuang via jitendra)
 
+    HADOOP-7664. Remove warmings when overriding final parameter configuration
+    if the override value is same as the final parameter value.
+    (Ravi Prakash via szetszwo)
+
   BUG FIXES
 
     HADOOP-7740. Fixed security audit logger configuration. 

Modified: 
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/conf/Configuration.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/conf/Configuration.java?rev=1199571&r1=1199570&r2=1199571&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/conf/Configuration.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/conf/Configuration.java
 Wed Nov  9 00:41:57 2011
@@ -1215,7 +1215,7 @@ public class Configuration implements It
               if (storeResource) {
                 updatingResource.put(attr, name.toString());
               }
-            } else {
+            } else if (!value.equals(properties.getProperty(attr))) {
               LOG.warn(name+":a attempt to override final parameter: "+attr
                      +";  Ignoring.");
             }