From 49811999f18a572018c6058988212d10578539fc Mon Sep 17 00:00:00 2001
From: "Suresh, Kamlesh" <kamlesh.suresh@verizonwireless.com>
Date: Fri, 15 Jan 2021 17:04:39 -0500
Subject: [PATCH] fixes

---
 .../Client Parameters/ClientParameterRegistry.swift        | 7 +++----
 MVMCore/MVMCore/Singletons/MVMCoreObject.m                 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift
index c3775d8..a9c3dc2 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
@@ -35,9 +35,8 @@ import Foundation
 
     static func injectParameters(with clientParameters: [String: Any], completionHandler:@escaping ([String: Any]?) -> ()) throws {
 
-        let clientParameterRegistry = MVMCoreObject.sharedInstance()?.clientParameterRegistry
-
-        guard let clientParameterModel = try ClientParameterRegistry.getClientParameterModel(clientParameters) else {
+        guard let clientParameterRegistry = MVMCoreObject.sharedInstance()?.clientParameterRegistry,
+              let clientParameterModel = try ClientParameterRegistry.getClientParameterModel(clientParameters) else {
             completionHandler(nil)
             return
         }
@@ -74,7 +73,7 @@ import Foundation
                 parametersList[parameterModel.type] = ["error": defaultErrorString]
                 group.enter()
                 // Dispatch asynchronous injection.
-                clientParameterRegistry?.injectParameter(parameterModel, before: timeout) { (clientParam) in
+                clientParameterRegistry.injectParameter(parameterModel, before: timeout) { (clientParam) in
                     // Queue the results for merge.
                     parametersWorkQueue.async {
                         if let clientParam = clientParam {
diff --git a/MVMCore/MVMCore/Singletons/MVMCoreObject.m b/MVMCore/MVMCore/Singletons/MVMCoreObject.m
index fbb0520..6b60d65 100644
--- a/MVMCore/MVMCore/Singletons/MVMCoreObject.m
+++ b/MVMCore/MVMCore/Singletons/MVMCoreObject.m
@@ -28,7 +28,7 @@
     self.actionHandler = [[MVMCoreActionHandler alloc] init];
     self.loggingDelegate = [[MVMCoreLoggingHandler alloc] init];
     self.loadHandler = [[MVMCoreLoadHandler alloc] init];
-    self.clientParameterRegistry = [ClientParameterRegistry new];
+    self.clientParameterRegistry = [[ClientParameterRegistry alloc] init];
 }
 
 @end