Return-Path: 
 <commits-return-18522-apmail-hive-commits-archive=hive.apache.org@hive.apache.org>
X-Original-To: apmail-hive-commits-archive@www.apache.org
Delivered-To: apmail-hive-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 5EE0818474
	for <apmail-hive-commits-archive@www.apache.org>;
 Thu, 12 Nov 2015 16:47:16 +0000 (UTC)
Received: (qmail 18534 invoked by uid 500); 12 Nov 2015 16:47:16 -0000
Delivered-To: apmail-hive-commits-archive@hive.apache.org
Received: (qmail 18485 invoked by uid 500); 12 Nov 2015 16:47:16 -0000
Mailing-List: contact commits-help@hive.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hive.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hive.apache.org>
List-Post: <mailto:commits@hive.apache.org>
List-Id: <commits.hive.apache.org>
Reply-To: hive-dev@hive.apache.org
Delivered-To: mailing list commits@hive.apache.org
Received: (qmail 18474 invoked by uid 99); 12 Nov 2015 16:47:16 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2015 16:47:16 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 0FDC8E01D9; Thu, 12 Nov 2015 16:47:16 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: spena@apache.org
To: commits@hive.apache.org
Message-Id: <7c0e543d8750448a9528e02208f6a863@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hive git commit: HIVE-11380: NPE when FileSinkOperator is not
 initialized (Yongzhi Chen, reviewed by Sergio Pena)
Date: Thu, 12 Nov 2015 16:47:16 +0000 (UTC)

Repository: hive
Updated Branches:
  refs/heads/branch-1 edaae1f13 -> 859d5ddab


HIVE-11380: NPE when FileSinkOperator is not initialized (Yongzhi Chen, reviewed by Sergio Pena)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/859d5dda
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/859d5dda
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/859d5dda

Branch: refs/heads/branch-1
Commit: 859d5ddabdbbd8cd7a41b4ee1dc9df576f2fb106
Parents: edaae1f
Author: Sergio Pena <sergio.pena@cloudera.com>
Authored: Sun Aug 2 20:07:11 2015 -0500
Committer: Sergio Pena <sergio.pena@cloudera.com>
Committed: Thu Nov 12 10:46:43 2015 -0600

----------------------------------------------------------------------
 ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/859d5dda/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
index ed791c0..d74c971 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
@@ -569,7 +569,7 @@ public class FileSinkOperator extends TerminalOperator<FileSinkDesc> implements
       assert filesIdx == numFiles;
 
       // in recent hadoop versions, use deleteOnExit to clean tmp files.
-      if (isNativeTable) {
+      if (isNativeTable && fs != null && fsp != null) {
         autoDelete = fs.deleteOnExit(fsp.outPaths[0]);
       }
     } catch (Exception e) {