Author: olga
Date: Mon Sep 22 14:30:34 2008
New Revision: 698006

URL: http://svn.apache.org/viewvc?rev=698006&view=rev
Log:
PIG-445: Null Pointer Exceptions in the mappers leading to lot of retries

Modified:
    incubator/pig/branches/types/CHANGES.txt
    
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
    
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java

Modified: incubator/pig/branches/types/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/pig/branches/types/CHANGES.txt?rev=698006&r1=698005&r2=698006&view=diff
==============================================================================
--- incubator/pig/branches/types/CHANGES.txt (original)
+++ incubator/pig/branches/types/CHANGES.txt Mon Sep 22 14:30:34 2008
@@ -230,3 +230,6 @@
 
     PIG-430: Projections in nested filter and inside foreach do not work (sms
     via olgan)
+
+    PIG-445: Null Pointer Exceptions in the mappers leading to lot of retries
+    (shravanmn via olgan)

Modified: 
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java?rev=698006&r1=698005&r2=698006&view=diff
==============================================================================
--- 
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
 (original)
+++ 
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigCombiner.java
 Mon Sep 22 14:30:34 2008
@@ -194,9 +194,6 @@
         @Override
         public void close() throws IOException {
             super.close();
-            /*if(runnableReporter!=null)
-                runnableReporter.setDone(true);*/
-            PhysicalOperator.setReporter(null);
         }
 
         /**

Modified: 
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java?rev=698006&r1=698005&r2=698006&view=diff
==============================================================================
--- 
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java
 (original)
+++ 
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/ProgressableReporter.java
 Mon Sep 22 14:30:34 2008
@@ -33,7 +33,8 @@
     }
 
     public void progress() {
-        rep.progress();
+        if(rep!=null)
+            rep.progress();
     }
 
     public void progress(String msg) {


Reply via email to