Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D99011BD4 for ; Tue, 17 Jun 2014 23:14:49 +0000 (UTC) Received: (qmail 95853 invoked by uid 500); 17 Jun 2014 23:14:49 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 95818 invoked by uid 500); 17 Jun 2014 23:14:49 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 95809 invoked by uid 99); 17 Jun 2014 23:14:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 23:14:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 23:14:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ACFF023888FE; Tue, 17 Jun 2014 23:14:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603314 - in /pig/branches/branch-0.13: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/JobControlCompiler.java Date: Tue, 17 Jun 2014 23:14:25 -0000 To: commits@pig.apache.org From: cheolsoo@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140617231425.ACFF023888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }