From 0df4c1b60a0be251487fb17356839fe17c912078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=BA=AE?= <yangliang36@huawei.com>
Date: Mon, 31 Oct 2022 09:59:16 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20293d28b=20from=20https://gitee.com/yang?=
 =?UTF-8?q?liang36/notification=5Fdistributed=5Fnotification=5Fservice/pul?=
 =?UTF-8?q?ls/715=20IssueNo:=20#I5YHL9=20Description:=20=E5=81=B6=E7=8E=B0?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E5=A4=84=E7=90=86=20Sig:=20SIG=5FApplication?=
 =?UTF-8?q?Framework=20Feature=20or=20Bugfix:=20Bugfix=20Binary=20Source:?=
 =?UTF-8?q?=20No?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 杨亮 <yangliang36@huawei.com>
Change-Id: Iecb248a5da03b34ce500ec8952245b5dea54ce65
---
 .../ans/src/notification_preferences_database.cpp    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/services/ans/src/notification_preferences_database.cpp b/services/ans/src/notification_preferences_database.cpp
index 1f7a74bb6..ddd71a199 100644
--- a/services/ans/src/notification_preferences_database.cpp
+++ b/services/ans/src/notification_preferences_database.cpp
@@ -313,13 +313,14 @@ DistributedKv::Status NotificationPreferencesDatabase::GetKvStore()
     if (status != DistributedKv::Status::SUCCESS) {
         ANS_LOGE("Return error: %{public}d.", status);
     } else {
-        ANS_LOGD("Get kvStore success.");
+        ANS_LOGI("Get kvStore success.");
     }
     return status;
 }
 
 void NotificationPreferencesDatabase::CloseKvStore()
 {
+    ANS_LOGI("Close kvStore success.");
     dataManager_.CloseKvStore(appId_, kvStorePtr_);
 }
 
@@ -674,14 +675,15 @@ bool NotificationPreferencesDatabase::PutBundlePropertyValueToDisturbeDB(
 bool NotificationPreferencesDatabase::ParseFromDisturbeDB(NotificationPreferencesInfo &info)
 {
     ANS_LOGD("%{public}s", __FUNCTION__);
-    if (!CheckKvStore()) {
-        ANS_LOGE("KvStore is nullptr.");
-        return false;
-    }
     ParseDoNotDisturbType(info);
     ParseDoNotDisturbBeginDate(info);
     ParseDoNotDisturbEndDate(info);
     ParseEnableAllNotification(info);
+
+    if (!CheckKvStore()) {
+        ANS_LOGE("KvStore is nullptr.");
+        return false;
+    }
     DistributedKv::Status status;
     std::vector<DistributedKv::Entry> entries;
     status = kvStorePtr_->GetEntries(DistributedKv::Key(KEY_BUNDLE_LABEL), entries);
-- 
Gitee