From c51c5629bd42ec76c88da28ff27e804f1beec165 Mon Sep 17 00:00:00 2001 From: "yingguofeng@huawei.com" Date: Fri, 22 Jul 2022 09:32:15 +0800 Subject: [PATCH] Description:js_date_time_format bugfix Issue:https://gitee.com/openharmony/ark_js_runtime/issues/I5ICN0?from=project-issue Signed-off-by: yingguofeng@huawei.com --- ecmascript/js_date_time_format.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ecmascript/js_date_time_format.cpp b/ecmascript/js_date_time_format.cpp index 6a4c8779..5c8aa465 100644 --- a/ecmascript/js_date_time_format.cpp +++ b/ecmascript/js_date_time_format.cpp @@ -321,9 +321,11 @@ JSHandle JSDateTimeFormat::InitializeDateTimeFormat(JSThread * ASSERT_PRINT(U_SUCCESS(status), "constructGenerator failed"); HourCycleOption hcDefault = OptionToHourCycle(generator->getDefaultHourCycle(status)); // b. Let hc be dateTimeFormat.[[HourCycle]]. - HourCycleOption hc = HourCycleOption::UNDEFINED; - hc = (hourCycle == HourCycleOption::UNDEFINED) ? OptionToHourCycle(resolvedLocale.extensions.find("hc")->second) : - hourCycle; + HourCycleOption hc = hourCycle; + if (hourCycle == HourCycleOption::UNDEFINED + && resolvedLocale.extensions.find("hc") != resolvedLocale.extensions.end()) { + hc = OptionToHourCycle(resolvedLocale.extensions.find("hc")->second); + } // c. If hc is null, then // i. Set hc to hcDefault. if (hc == HourCycleOption::UNDEFINED) { -- Gitee