Merge branch 'master' into 'master'

Add Activity ID for repeated operation See merge request entgra/carbon-device-mgt!714
4 years ago · 8e6ab9d8cd
parent d627bfc6c3 864bbcdc83
commit 8e6ab9d8cd
1 changed files with 2 additions and 0 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
@ -229,6 +229,8 @@ public class OperationManagerImpl implements OperationManager {
                                    + operationCode);
                        }
                        Activity activity = new Activity();
+                        activity.setActivityId(DeviceManagementConstants.OperationAttributes.ACTIVITY +
+                                operation.getId());
                        activity.setActivityStatus(
                                this.getActivityStatus(deviceValidationResult, deviceAuthorizationResult));
                        return activity;