ruwin
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fetch device according to the device identifier

Browse Source
revert-70aa11f8
manoj 9 years ago
parent 39b85a3b44
commit 14c6773b57
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
Unescape View File

@ -59,7 +59,7 @@ public interface OperationManager {
public Operation getNextPendingOperation(DeviceIdentifier deviceId) throws OperationManagementException;
public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus) throws
public void updateOperation(DeviceIdentifier deviceId, int operationId, Operation.Status operationStatus) throws
OperationManagementException;
public void deleteOperation(int operationId) throws OperationManagementException;

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
Unescape View File

@ -465,7 +465,7 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
}
@Override
public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus)
public void updateOperation(DeviceIdentifier deviceId, int operationId, Operation.Status operationStatus)
throws OperationManagementException {
DeviceManagementDataHolder.getInstance().getOperationManager().updateOperation(deviceId,operationId,
operationStatus);

14
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
Unescape View File

@ -263,7 +263,7 @@ public class OperationManagerImpl implements OperationManager {
}
@Override
public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus)
public void updateOperation(DeviceIdentifier deviceIdentifier, int operationId, Operation.Status operationStatus)
throws OperationManagementException {
if (log.isDebugEnabled()) {
@ -279,11 +279,19 @@ public class OperationManagerImpl implements OperationManager {
}
dtoOperation.setStatus(org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.valueOf
(operationStatus.toString()));
Device device = deviceManagementService.getCoreDevice(deviceIdentifier);
OperationManagementDAOFactory.beginTransaction();
operationDAO.updateOperation(dtoOperation);
operationDAO.updateOperationStatus(deviceId,operationId,
org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.valueOf(operationStatus.toString()));
operationDAO.updateOperationStatus(device.getId(), operationId,
org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status
.valueOf(operationStatus.toString()));
OperationManagementDAOFactory.commitTransaction();
}catch (DeviceManagementException ex){
log.error("Error occurred while fetch the device for device identifier: " + deviceIdentifier.getId() + " " +
"type:" + deviceIdentifier.getType(), ex);
throw new OperationManagementException("Error occurred while update operation", ex);
} catch (OperationManagementDAOException ex) {
try {
OperationManagementDAOFactory.rollbackTransaction();

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
Unescape View File

@ -149,7 +149,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
}
@Override
public void updateOperation(int deviceId, int operationId, Operation.Status operationStatus) throws
public void updateOperation(DeviceIdentifier deviceId, int operationId, Operation.Status operationStatus) throws
OperationManagementException {
DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().updateOperation(deviceId, operationId,
operationStatus);

Write Preview
Loading…
Cancel
Save