mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'feature/develop_mvp_3'

Browse Source 
Develop

See merge request BPHV_MIPS/mvm_core!206
This commit is contained in:
Pfeil, Scott Robert 2022-04-29 15:41:42 +00:00
commit ce0d984c0b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterHandler.swift
View File

@ -88,19 +88,24 @@
complete = true complete = true
} }
} }
// Setup timeout. // Setup timeout.
self.parametersWorkQueue.asyncAfter(deadline: .now() + .seconds(Int(timeout)), execute: timeoutWorkItem) self.parametersWorkQueue.asyncAfter(deadline: .now() + .seconds(Int(timeout)), execute: timeoutWorkItem)
// Setup the parameter execution. // Setup the parameter execution.
for (index, parameterHandler) in self.parameterHandlerList.enumerated() { for (index, parameterHandler) in self.parameterHandlerList.enumerated() {
let parameterType = parameterHandler.clientParameterModel.type
self.group.enter() self.group.enter()
parameterHandler.fetchClientParameters(requestParameters: requestParameters, parameterHandler.fetchClientParameters(requestParameters: requestParameters,
timingOutIn: timeout) { (receivedParameter) in timingOutIn: timeout) { (receivedParameter) in
// Queue the results for merge. // Queue the results for merge.
self.parametersWorkQueue.async { self.parametersWorkQueue.async {
returnedList[index] = receivedParameter if (returnedList[index] != nil) {
self.group.leave() // Leaving is only done after setup (barriered). MVMCoreLoggingHandler.shared()?.addError(toLog: MVMCoreErrorObject(title: nil, message: "Client parameter \(parameterType) has already executed. The completion handler should only be called once!", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: String(describing: ClientParameterHandler.self))!)
} else {
returnedList[index] = receivedParameter
self.group.leave() // Leaving is only done after setup (barriered).
}
} }
} }
} }