From 6aea69ae44d2956db645118d108607c26fd86b09 Mon Sep 17 00:00:00 2001 From: geethkokila Date: Fri, 3 Jun 2016 11:40:00 +0530 Subject: [PATCH] Fixing the duplicate issue --- .../operation/mgt/dao/impl/GenericOperationDAOImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git 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 index d96920d703..7089f5dfd1 100644 --- 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 @@ -355,6 +355,7 @@ public class GenericOperationDAOImpl implements OperationDAO { int operationId = 0; int enrolmentId = 0; + int responceId = 0; Activity activity = null; ActivityStatus activityStatus = null; while (rs.next()) { @@ -380,8 +381,9 @@ public class GenericOperationDAOImpl implements OperationDAO { activityStatus.setStatus(ActivityStatus.Status.valueOf(rs.getString("STATUS"))); List operationResponses = new ArrayList<>(); - if (rs.getInt("UPDATED_TIMESTAMP") != 0) { + if (rs.getTimestamp("RECEIVED_TIMESTAMP") != (null)) { operationResponses.add(this.getOperationResponse(rs)); + responceId = rs.getInt("OP_RES_ID"); } activityStatus.setResponses(operationResponses); statusList.add(activityStatus); @@ -407,6 +409,7 @@ public class GenericOperationDAOImpl implements OperationDAO { List operationResponses = new ArrayList<>(); if (rs.getTimestamp("RECEIVED_TIMESTAMP") != (null)) { operationResponses.add(this.getOperationResponse(rs)); + responceId = rs.getInt("OP_RES_ID"); } activityStatus.setResponses(operationResponses); activity.getActivityStatus().add(activityStatus); @@ -414,9 +417,10 @@ public class GenericOperationDAOImpl implements OperationDAO { enrolmentId = rs.getInt("ENROLMENT_ID"); } - if (operationId == rs.getInt("OPERATION_ID") && enrolmentId == rs.getInt("ENROLMENT_ID")){ + if (rs.getInt("OP_RES_ID") != 0 && responceId != rs.getInt("OP_RES_ID")){ if (rs.getTimestamp("RECEIVED_TIMESTAMP") != (null)) { activityStatus.getResponses().add(this.getOperationResponse(rs)); + responceId = rs.getInt("OP_RES_ID"); } } }