You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by lp...@apache.org on 2020/10/23 14:55:18 UTC
[hive] branch master updated: HIVE-24113: NPE in
GenericUDFToUnixTimeStamp (#1460) (Raj Kumar Singh,
reviewed by Zoltan Haindrich and Laszlo Pinter)
This is an automated email from the ASF dual-hosted git repository.
lpinter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 922ff82 HIVE-24113: NPE in GenericUDFToUnixTimeStamp (#1460) (Raj Kumar Singh, reviewed by Zoltan Haindrich and Laszlo Pinter)
922ff82 is described below
commit 922ff82917ed08a717bb17bde497f4d20a3f94f2
Author: Rajkumar Singh <ra...@gmail.com>
AuthorDate: Fri Oct 23 07:55:03 2020 -0700
HIVE-24113: NPE in GenericUDFToUnixTimeStamp (#1460) (Raj Kumar Singh, reviewed by Zoltan Haindrich and Laszlo Pinter)
---
.../org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUnixTime.java | 3 ++-
.../apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUnixTime.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUnixTime.java
index 4138b4e..66418ac 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUnixTime.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFromUnixTime.java
@@ -107,7 +107,8 @@ public class GenericUDFFromUnixTime extends GenericUDF {
}
if (timeZone == null) {
- timeZone = SessionState.get().getConf().getLocalTimeZone();
+ timeZone = SessionState.get() == null ? new HiveConf().getLocalTimeZone() : SessionState.get().getConf()
+ .getLocalTimeZone();
formatter.setTimeZone(TimeZone.getTimeZone(timeZone));
}
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.java
index 163ad38..4a30654 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.java
@@ -123,7 +123,8 @@ public class GenericUDFToUnixTimeStamp extends GenericUDF {
}
if (timeZone == null) {
- timeZone = SessionState.get().getConf().getLocalTimeZone();
+ timeZone = SessionState.get() == null ? new HiveConf().getLocalTimeZone() : SessionState.get().getConf()
+ .getLocalTimeZone();
formatter.setTimeZone(TimeZone.getTimeZone(timeZone));
}
}