svn commit: r566779 - in /lucene/hadoop/trunk: CHANGES.txt src/ant/org/apache/hadoop/ant/DfsTask.java

[cu...@apache.org]

Author: cutting
Date: Thu Aug 16 10:06:56 2007
New Revision: 566779

URL: http://svn.apache.org/viewvc?view=rev&rev=566779
Log:
HADOOP-1692.  In DFS ant task, don't cache the configuration.  Contributed by Chris Douglas.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=566779&r1=566778&r2=566779
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Aug 16 10:06:56 2007
@@ -39,6 +39,9 @@
     HADOOP-1463.  HDFS report correct usage statistics for disk space
     used by HDFS.  (Hairong Kuang via dhruba)
 
+    HADOOP-1692.  In DFS ant task, don't cache the Configuration.
+    (Chris Douglas via cutting)
+
   IMPROVEMENTS
 
     HADOOP-1651.  Improve progress reporting.

Modified: lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java?view=diff&rev=566779&r1=566778&r2=566779
==============================================================================
--- lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java (original)
+++ lucene/hadoop/trunk/src/ant/org/apache/hadoop/ant/DfsTask.java Thu Aug 16 10:06:56 2007
@@ -23,8 +23,6 @@
 import java.io.PrintStream;
 
 import java.util.LinkedList;
-import java.util.Map;
-import java.util.WeakHashMap;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FsShell;
@@ -48,8 +46,6 @@
       public void write(int b)    { /* ignore */ }
       public String toString()    { return ""; }
   };
-  private static final Map<Project, AntClassLoader> clCache =
-    new WeakHashMap<Project, AntClassLoader>();
 
   protected AntClassLoader confloader;
   protected OutputStream out = nullOut;
@@ -154,8 +150,6 @@
 
     System.setErr(antErr);
     System.setOut(antOut);
-    // permit conf ClassLoader to be garbage collected when last ref to
-    // Project disappears
     confloader.cleanup();
     confloader.setParent(null);
   }
@@ -177,12 +171,7 @@
     argv.add(0, cmd);
 
     if (null == confloader) {
-      if (null == clCache.get(getProject())) {
-        setConf(getProject().getProperty("hadoop.conf.dir"));
-        clCache.put(getProject(), confloader);
-      } else {
-        confloader = clCache.get(getProject());
-      }
+      setConf(getProject().getProperty("hadoop.conf.dir"));
     }
 
     int exit_code = 0;