svn commit: r1352396 - in /hama/trunk: CHANGES.txt core/src/main/java/org/apache/hama/bsp/TaskInProgress.java

[surajsmenon]

Author: surajsmenon
Date: Thu Jun 21 02:28:04 2012
New Revision: 1352396

URL: http://svn.apache.org/viewvc?rev=1352396&view=rev
Log:
[HAMA-595] - Fix NullPointerException in Task Scheduler

Modified:
    hama/trunk/CHANGES.txt
    hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java

Modified: hama/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1352396&r1=1352395&r2=1352396&view=diff
==============================================================================
--- hama/trunk/CHANGES.txt (original)
+++ hama/trunk/CHANGES.txt Thu Jun 21 02:28:04 2012
@@ -20,6 +20,8 @@ Release 0.5 - April 10, 2012 
 
   BUG FIXES
 
+   HAMA-595: Fix NullPointerException in Task Scheduler (surajmenon)
+
   IMPROVEMENTS
 
     HAMA-590: Fix TestSubmitGraphJob tests (tjungblut)

Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java?rev=1352396&r1=1352395&r2=1352396&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java 
(original)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/TaskInProgress.java Thu 
Jun 21 02:28:04 2012
@@ -149,6 +149,7 @@ class TaskInProgress {
         if (groom == null) {
           LOG.error("Could not find groom for location: " + location
               + " ; active grooms: " + grooms.keySet());
+          continue;
         }
         Integer taskInGroom = tasksInGroomMap.get(groom);
         taskInGroom = (taskInGroom == null) ? 0 : taskInGroom;