https://telecominfraproject.atlassian.net/browse/WIFI-7831

Signed-off-by: stephb9959 <[email protected]>
Telecominfraproject · Oct 4, 2023 · 3469b20 · 3469b20
1 parent 65e5669
commit 3469b20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/src/DeviceTypeCache.h b/src/DeviceTypeCache.h
@@ -63,17 +63,9 @@ namespace OpenWifi {
 			std::lock_guard G(Mutex_);
 
 			Initialized_ = true;
-			std::string DeviceTypes;
-			if (AppServiceRegistry().Get("deviceTypes", DeviceTypes)) {
-				Poco::JSON::Parser P;
-				try {
-					auto O = P.parse(DeviceTypes).extract<Poco::JSON::Array::Ptr>();
-					for (const auto &i : *O) {
-						DeviceTypes_.insert(i.toString());
-					}
-				} catch (...) {
-				}
-			}
+			std::vector<std::string> DeviceTypes;
+			AppServiceRegistry().Get("deviceTypes", DeviceTypes);
+            std::for_each(DeviceTypes.begin(),DeviceTypes.end(),[&](const std::string &s){ DeviceTypes_.insert(s);});
 		}
 
 		inline bool UpdateDeviceTypes() {
@@ -107,15 +99,9 @@ namespace OpenWifi {
 
 		inline void SaveCache() {
 			std::lock_guard G(Mutex_);
-
-			Poco::JSON::Array Arr;
-			for (auto const &i : DeviceTypes_)
-				Arr.add(i);
-
-			std::stringstream OS;
-			Arr.stringify(OS);
-
-			AppServiceRegistry().Set("deviceTypes", OS.str());
+            std::vector<std::string>    DeviceTypes;
+            std::for_each(DeviceTypes_.begin(),DeviceTypes_.end(),[&](const std::string &s){DeviceTypes.emplace_back(s);});
+			AppServiceRegistry().Set("deviceTypes", DeviceTypes);
 		}
 	};
 

diff --git a/src/framework/AppServiceRegistry.h b/src/framework/AppServiceRegistry.h
@@ -66,7 +66,7 @@ namespace OpenWifi {
 		}
 
         bool Get(const char *key, std::vector<std::string> &Value) {
-            if(Registry_->has(key) && Registry_->isArray(key)) {
+            if(Registry_->has(key) && !Registry_->isNull(key) && Registry_->isArray(key)) {
                 auto Arr = Registry_->get(key);
                 for(const auto &v:Arr) {
                     Value.emplace_back(v);