From cc6883d955a1b349e1523e52cfda0885676ea0cb Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Thu, 2 Jun 2016 22:26:19 +0530
Subject: [PATCH] Changing the if to a while loop, fixing the activity id issue

---
 .../core/operation/mgt/dao/impl/GenericOperationDAOImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dd3ea76b0c..2fa5f92b48 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
@@ -282,7 +282,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
             int enrolmentId = 0;
             ActivityStatus activityStatus = null;
 
-            if (rs.next()) {
+            while (rs.next()) {
                 activity = new Activity();
                 if (enrolmentId == 0) {
                     activity.setType(Activity.Type.valueOf(rs.getString("OPERATION_TYPE")));