You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/11/08 21:28:11 UTC
svn commit: r1407259 - in /hadoop/common/branches/branch-1.1: CHANGES.txt
src/core/org/apache/hadoop/conf/Configuration.java
Author: suresh
Date: Thu Nov 8 20:28:11 2012
New Revision: 1407259
URL: http://svn.apache.org/viewvc?rev=1407259&view=rev
Log:
HADOOP-8995. Merge r1403562 from branch-1 to release 1.1.1
Modified:
hadoop/common/branches/branch-1.1/CHANGES.txt
hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/conf/Configuration.java
Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1407259&r1=1407258&r2=1407259&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Thu Nov 8 20:28:11 2012
@@ -10,6 +10,9 @@ Release 1.1.1 - Unreleased
HADOOP-8823. ant package target should not depend on cn-docs. (szetszwo)
+ HADOOP-8995. Remove unnecessary bogus exception from Configuration.java.
+ (Jing Zhao via suresh)
+
BUG FIXES
HADOOP-8878. Uppercase namenode hostname causes hadoop dfs calls with
Modified: hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/conf/Configuration.java?rev=1407259&r1=1407258&r2=1407259&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/conf/Configuration.java Thu Nov 8 20:28:11 2012
@@ -223,9 +223,6 @@ public class Configuration implements It
*/
public Configuration(boolean loadDefaults) {
this.loadDefaults = loadDefaults;
- if (LOG.isDebugEnabled()) {
- LOG.debug(StringUtils.stringifyException(new IOException("config()")));
- }
synchronized(Configuration.class) {
REGISTRY.put(this, null);
}
@@ -256,11 +253,6 @@ public class Configuration implements It
*/
@SuppressWarnings("unchecked")
public Configuration(Configuration other) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(StringUtils.stringifyException
- (new IOException("config(config)")));
- }
-
this.resources = (ArrayList)other.resources.clone();
synchronized(other) {
if (other.properties != null) {