svn commit: r584827 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java

[omalley]

Author: omalley
Date: Mon Oct 15 10:25:18 2007
New Revision: 584827

URL: http://svn.apache.org/viewvc?rev=584827&view=rev
Log:
Merge -r 584043:584044 from trunk to 14 branch to fix HADOOP-2036.

Modified:
    lucene/hadoop/branches/branch-0.14/CHANGES.txt
    
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java

Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?rev=584827&r1=584826&r2=584827&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Mon Oct 15 10:25:18 2007
@@ -8,6 +8,8 @@
     HADOOP-2053. Fixed a dangling reference to a memory buffer in the map 
     output sorter. (acmurthy via omalley)
 
+    HADOOP-2036. Fix a NullPointerException in JvmMetrics class. (nigel)
+
 Release 0.14.2 - 2007-10-09
 
   BUG FIXES

Modified: 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java?rev=584827&r1=584826&r2=584827&view=diff
==============================================================================
--- 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
 Mon Oct 15 10:25:18 2007
@@ -126,6 +126,8 @@
         int threadsTerminated = 0;
         
         for (ThreadInfo threadInfo : threadInfos) {
+            // threadInfo is null if the thread is not alive or doesn't exist
+            if (threadInfo == null) continue;
             Thread.State state = threadInfo.getThreadState();
             if (state == NEW) {
                 threadsNew++;