summaryrefslogtreecommitdiffstats
path: root/services/services-engine/src/main
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@bell.ca>2021-03-18 12:39:46 +0000
committera.sreekumar <ajith.sreekumar@bell.ca>2021-03-19 10:54:13 +0000
commit369a94a9fd626b35d52c2e7ee5f19e6ff6e1b9d8 (patch)
treed2078b43c9c67fbf543bfa7d1440d28596649d05 /services/services-engine/src/main
parentcc52ec6f85b6aa2712c11b38d66844f8595211b4 (diff)
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 <ajith.sreekumar@bell.ca>
Diffstat (limited to 'services/services-engine/src/main')
-rw-r--r--services/services-engine/src/main/java/org/onap/policy/apex/service/engine/main/ApexEventUnmarshaller.java8
1 files changed, 4 insertions, 4 deletions
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 =