You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2012/04/21 02:52:10 UTC

svn commit: r1328551 - in /pig/trunk: CHANGES.txt contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java

Author: daijy
Date: Sat Apr 21 00:52:10 2012
New Revision: 1328551

URL: http://svn.apache.org/viewvc?rev=1328551&view=rev
Log:
PIG-2644: Piggybank's HadoopJobHistoryLoader throws NPE when reading broken history file

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1328551&r1=1328550&r2=1328551&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Apr 21 00:52:10 2012
@@ -106,6 +106,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-2644: Piggybank's HadoopJobHistoryLoader throws NPE when reading broken history file (herberts via daijy)
+
 PIG-2627: Custom partitioner not set when POSplit is involved in Plan (aniket486 via daijy)
 
 PIG-2596: Jython UDF does not handle boolean output (aniket486 via daijy)

Modified: pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java?rev=1328551&r1=1328550&r2=1328551&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java (original)
+++ pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/HadoopJobHistoryLoader.java Sat Apr 21 00:52:10 2012
@@ -482,7 +482,7 @@ public class HadoopJobHistoryLoader exte
             // CHECK_IT: Only one SUCCESSFUL TASK ATTEMPT
             Map.Entry<String, JobHistory.TaskAttempt> tae = kv.next();
             JobHistory.TaskAttempt attempt = tae.getValue();
-            if (attempt.getValues().get(JobHistory.Keys.TASK_STATUS).equals(
+            if (null != attempt && null != attempt.getValues() && attempt.getValues().containsKey(JobHistory.Keys.TASK_STATUS) && attempt.getValues().get(JobHistory.Keys.TASK_STATUS).equals(
                     "SUCCESS")) {
                 return attempt.getValues();
             }