Repository: hive Updated Branches: refs/heads/branch-1.2 dc121c72b -> 1c80f2e5a
HIVE-10731 : NullPointerException in HiveParser.g (Pengcheng Xiong via John Pullokkaran) Signed-off-by: Ashutosh Chauhan <hashut...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/442f632e Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/442f632e Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/442f632e Branch: refs/heads/branch-1.2 Commit: 442f632e987673e9f4f6c846464ea062603ff05d Parents: dc121c7 Author: Pengcheng Xiong <pxi...@hortonworks.com> Authored: Mon May 18 14:52:00 2015 -0700 Committer: Pengcheng Xiong <pxi...@apache.org> Committed: Fri Sep 4 17:26:54 2015 -0700 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/442f632e/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g index ef1a36a..9fb7825 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g @@ -650,6 +650,9 @@ import org.apache.hadoop.hive.conf.HiveConf; this.hiveConf = hiveConf; } protected boolean useSQL11ReservedKeywordsForIdentifier() { + if(hiveConf==null){ + return false; + } return !HiveConf.getBoolVar(hiveConf, HiveConf.ConfVars.HIVE_SUPPORT_SQL11_RESERVED_KEYWORDS); } }
