Repository: hive Updated Branches: refs/heads/master 15220e8b5 -> 48aefe450
HIVE-13311: MetaDataFormatUtils throws NPE when HiveDecimal.create is null (Reuben Kuhnert, 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/48aefe45 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/48aefe45 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/48aefe45 Branch: refs/heads/master Commit: 48aefe4506ea5f6934a129c09ca9e13269adf895 Parents: 15220e8 Author: Sergio Pena <sergio.p...@cloudera.com> Authored: Mon Mar 21 12:31:59 2016 -0500 Committer: Sergio Pena <sergio.p...@cloudera.com> Committed: Mon Mar 21 12:32:59 2016 -0500 ---------------------------------------------------------------------- .../hive/ql/metadata/formatting/MetaDataFormatUtils.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/48aefe45/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java index a78700d..e76fb91 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java @@ -150,7 +150,13 @@ public final class MetaDataFormatUtils { if (val == null) { return ""; } - return HiveDecimal.create(new BigInteger(val.getUnscaled()), val.getScale()).toString(); + + HiveDecimal result = HiveDecimal.create(new BigInteger(val.getUnscaled()), val.getScale()); + if (result != null) { + return result.toString(); + } else { + return ""; + } } private static String convertToString(org.apache.hadoop.hive.metastore.api.Date val) {