community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the duplicate issue

Browse Source
This commit is contained in:
geethkokila 2016-06-03 11:40:00 +05:30
parent efa74030b4
commit 6aea69ae44
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
View File

@ -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<OperationResponse> 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<OperationResponse> 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");
}
}
}