Fixing the activity Id issue

8 years ago · a04300b3b6
parent cc6883d955
commit a04300b3b6
1 changed files with 1 additions and 1 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
@ -283,8 +283,8 @@ public class GenericOperationDAOImpl implements OperationDAO {
            ActivityStatus activityStatus = null;

            while (rs.next()) {
-                activity = new Activity();
                if (enrolmentId == 0) {
+                    activity = new Activity();
                    activity.setType(Activity.Type.valueOf(rs.getString("OPERATION_TYPE")));
                    activity.setCreatedTimeStamp(new java.util.Date(rs.getLong(("CREATED_TIMESTAMP"))).toString());
                    activity.setCode(rs.getString("OPERATION_CODE"));