Author: ab Date: Tue Dec 20 03:19:21 2005 New Revision: 357962 URL: http://svn.apache.org/viewcvs?rev=357962&view=rev Log: Remove remaining calls to static NutchConf.get() in favor of using per-instance local configuration getConf().
Modified: lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Fetcher.java lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Injector.java Modified: lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Fetcher.java URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Fetcher.java?rev=357962&r1=357961&r2=357962&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Fetcher.java (original) +++ lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Fetcher.java Tue Dec 20 03:19:21 2005 @@ -288,7 +288,7 @@ } // select a timeout that avoids a task timeout - long timeout = NutchConf.get().getInt("mapred.task.timeout", 10*60*1000)/2; + long timeout = getConf().getInt("mapred.task.timeout", 10*60*1000)/2; do { // wait for threads to exit try { Modified: lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java?rev=357962&r1=357961&r2=357962&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java (original) +++ lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java Tue Dec 20 03:19:21 2005 @@ -159,7 +159,7 @@ throws IOException { File tempDir = - new File(NutchConf.get().get("mapred.temp.dir", ".") + + new File(getConf().get("mapred.temp.dir", ".") + "/generate-temp-"+ Integer.toString(new Random().nextInt(Integer.MAX_VALUE))); Modified: lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Injector.java URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Injector.java?rev=357962&r1=357961&r2=357962&view=diff ============================================================================== --- lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Injector.java (original) +++ lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Injector.java Tue Dec 20 03:19:21 2005 @@ -84,7 +84,7 @@ LOG.info("Injector: urlDir: " + urlDir); File tempDir = - new File(NutchConf.get().get("mapred.temp.dir", ".") + + new File(getConf().get("mapred.temp.dir", ".") + "/inject-temp-"+ Integer.toString(new Random().nextInt(Integer.MAX_VALUE)));