Return-Path: 
 <commits-return-2966-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 6A6569E6C
	for <apmail-hive-commits-archive@www.apache.org>;
 Wed, 16 Nov 2011 18:22:14 +0000 (UTC)
Received: (qmail 14561 invoked by uid 500); 16 Nov 2011 18:22:14 -0000
Delivered-To: apmail-hive-commits-archive@hive.apache.org
Received: (qmail 14525 invoked by uid 500); 16 Nov 2011 18:22:13 -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 14517 invoked by uid 99); 16 Nov 2011 18:22:13 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2011 18:22:13 +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; Wed, 16 Nov 2011 18:22:12 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 43240238889B
	for <commits@hive.apache.org>; Wed, 16 Nov 2011 18:21:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1202820 -
 /hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
Date: Wed, 16 Nov 2011 18:21:52 -0000
To: commits@hive.apache.org
From: heyongqiang@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111116182152.43240238889B@eris.apache.org>

Author: heyongqiang
Date: Wed Nov 16 18:21:51 2011
New Revision: 1202820

URL: http://svn.apache.org/viewvc?rev=1202820&view=rev
Log:
HIVE-2581: explain task: getJSONPlan throws a NPE if the ast is null (namit via He Yongqiang)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java?rev=1202820&r1=1202819&r2=1202820&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java Wed Nov 16 18:21:51 2011
@@ -65,13 +65,15 @@ public class ExplainTask extends Task<Ex
     }
 
     // Print out the parse AST
-    String jsonAST = outputAST(work.getAstStringTree(), out, jsonOutput, 0);
-    if (out != null) {
-      out.println();
-    }
+    if (work.getAstStringTree() != null) {
+      String jsonAST = outputAST(work.getAstStringTree(), out, jsonOutput, 0);
+      if (out != null) {
+        out.println();
+      }
 
-    if (jsonOutput) {
-      outJSONObject.put("ABSTRACT SYNTAX TREE", jsonAST);
+      if (jsonOutput) {
+        outJSONObject.put("ABSTRACT SYNTAX TREE", jsonAST);
+      }
     }
 
     JSONObject jsonDependencies = outputDependencies(out, jsonOutput,