svn commit: r585410 - in /lucene/hadoop/branches/branch-0.15: CHANGES.txt src/java/org/apache/hadoop/mapred/JobTracker.java

[ddas]

Author: ddas
Date: Wed Oct 17 01:31:31 2007
New Revision: 585410

URL: http://svn.apache.org/viewvc?rev=585410&view=rev
Log:
Merge -r 585408:585409 from trunk to 0.15 branch. Fixes HADOOP-1973.

Modified:
    lucene/hadoop/branches/branch-0.15/CHANGES.txt
    
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/JobTracker.java

Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/CHANGES.txt?rev=585410&r1=585409&r2=585410&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.15/CHANGES.txt Wed Oct 17 01:31:31 2007
@@ -303,6 +303,11 @@
     than the InterruptedException. This behavior is there for the other long
     running threads in the JobTracker. (Arun C Murthy via ddas)
 
+    HADOOP-1973. The FileSystem object would be accessed on the JobTracker
+    through a RPC in the InterTrackerProtocol. The check for the object being
+    null was missing and hence NPE would be thrown sometimes. This issue fixes
+    that problem.  (Amareshwari Sri Ramadasu via ddas) 
+
   IMPROVEMENTS
 
     HADOOP-1908. Restructure data node code so that block sending and 

Modified: 
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/JobTracker.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=585410&r1=585409&r2=585410&view=diff
==============================================================================
--- 
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/JobTracker.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/JobTracker.java
 Wed Oct 17 01:31:31 2007
@@ -1471,6 +1471,9 @@
    * Grab the local fs name
    */
   public synchronized String getFilesystemName() throws IOException {
+    if (fs == null) {
+      throw new IllegalStateException("FileSystem object not available yet");
+    }
     return fs.getName();
   }