Forráskód Böngészése

HADOOP-8995. Merge r1403562 from branch-1 to release 1.1.1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1407259 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas 12 éve
szülő
commit
be94769750
2 módosított fájl, 3 hozzáadás és 8 törlés
  1. 3 0
      CHANGES.txt
  2. 0 8
      src/core/org/apache/hadoop/conf/Configuration.java

+ 3 - 0
CHANGES.txt

@@ -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

+ 0 - 8
src/core/org/apache/hadoop/conf/Configuration.java

@@ -223,9 +223,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
    */
   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 Iterable<Map.Entry<String,String>>,
    */
   @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) {