You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2014/06/18 01:14:25 UTC

svn commit: r1603314 - in /pig/branches/branch-0.13: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java

Author: cheolsoo
Date: Tue Jun 17 23:14:25 2014
New Revision: 1603314

URL: http://svn.apache.org/r1603314
Log:
PIG-4017: NPE thrown from JobControlCompiler.shipToHdfs (cheolsoo)

Modified:
    pig/branches/branch-0.13/CHANGES.txt
    pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java

Modified: pig/branches/branch-0.13/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/CHANGES.txt?rev=1603314&r1=1603313&r2=1603314&view=diff
==============================================================================
--- pig/branches/branch-0.13/CHANGES.txt (original)
+++ pig/branches/branch-0.13/CHANGES.txt Tue Jun 17 23:14:25 2014
@@ -151,6 +151,8 @@ PIG-3882: Multiquery off mode execution 
  
 BUG FIXES
 
+PIG-4017: NPE thrown from JobControlCompiler.shipToHdfs (cheolsoo)
+
 PIG-3975: Multiple Scalar reference calls leading to missing records (knoguchi via rohini) 
 
 PIG-3997: Issue on Pig docs: Testing and Diagnostics (zjffdu via cheolsoo)

Modified: pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java?rev=1603314&r1=1603313&r2=1603314&view=diff
==============================================================================
--- pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java (original)
+++ pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java Tue Jun 17 23:14:25 2014
@@ -1704,7 +1704,9 @@ public class JobControlCompiler{
         } finally {
             org.apache.commons.io.IOUtils.closeQuietly(is);
             // IOUtils should not close stream to HDFS quietly
-            os.close();
+            if (os != null) {
+                os.close();
+            }
         }
         return dst;
     }