Author: shv Date: Mon Jan 24 22:02:30 2011 New Revision: 1063012 URL: http://svn.apache.org/viewvc?rev=1063012&view=rev Log: HADOOP-7046. Merge -r 1063005:1063006 from trunk to branch 0.22.
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/Groups.java Modified: hadoop/common/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1063012&r1=1063011&r2=1063012&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/CHANGES.txt Mon Jan 24 22:02:30 2011 @@ -392,6 +392,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 Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java?rev=1063012&r1=1063011&r2=1063012&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java (original) +++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java Mon Jan 24 22:02:30 2011 @@ -1581,7 +1581,6 @@ public class Configuration implements It public void writeXml(Writer out) throws IOException { Document doc = asXmlDocument(); - Properties properties = getProps(); try { DOMSource source = new DOMSource(doc); StreamResult result = new StreamResult(out); Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/Groups.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/Groups.java?rev=1063012&r1=1063011&r2=1063012&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/Groups.java (original) +++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/Groups.java Mon Jan 24 22:02:30 2011 @@ -134,7 +134,7 @@ public class Groups { * @param conf * @return the groups being used to map user-to-groups. */ - public static Groups getUserToGroupsMappingService(Configuration conf) { + public static synchronized Groups getUserToGroupsMappingService(Configuration conf) { if(GROUPS == null) { if(LOG.isDebugEnabled()) { LOG.debug(" Creating new Groups object");