From e5a1908b92c02c91ad3a703105e5ac212ab27f6b Mon Sep 17 00:00:00 2001 From: "a.sreekumar" Date: Thu, 18 Mar 2021 12:39:46 +0000 Subject: Fixing parallel event execution problem in APEX-PDP REST layer Parallel event execution in APEX was resulting in incorrect dynamic REST url. This issue is fixed in this review. Change-Id: Id8a28c001a7fd7915df1f5909109bb369667ab40 Issue-ID: POLICY-3019 Signed-off-by: a.sreekumar (cherry picked from commit 369a94a9fd626b35d52c2e7ee5f19e6ff6e1b9d8) --- .../policy/apex/service/engine/main/ApexEventUnmarshaller.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'services') diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java index fdc404c67..d31940aa0 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java @@ -226,13 +226,13 @@ public class ApexEventUnmarshaller implements ApexEventReceiver, Runnable { // Ignore this event continue; } - if (!generateExecutionId) { apexEvent.setExecutionId(executionId); + apexEvent.setExecutionProperties(executionProperties); + } else { + // Clean up executionProperties in case if it is not a response event to a request made from APEX + apexEvent.setExecutionProperties(new Properties(executionProperties)); } - - apexEvent.setExecutionProperties(executionProperties); - // Cache synchronized events that are sent if (consumerParameters.isPeeredMode(EventHandlerPeeredMode.SYNCHRONOUS)) { final SynchronousEventCache synchronousEventCache = -- cgit 1.2.3-korg