Merge branch 'fix-test-failure' into 'master'

Fix test failure

See merge request entgra/carbon-device-mgt!859
feature/traccar-sync
Charitha Goonetilleke 3 years ago
commit 12acd443e6

@ -425,7 +425,8 @@ public class GenericOperationDAOImpl implements OperationDAO {
" LEFT JOIN " + " LEFT JOIN " +
" DM_DEVICE_OPERATION_RESPONSE opr ON opr.EN_OP_MAP_ID = eom.ID " + " DM_DEVICE_OPERATION_RESPONSE opr ON opr.EN_OP_MAP_ID = eom.ID " +
"WHERE " + "WHERE " +
" eom.OPERATION_ID = ? AND eom.TENANT_ID = ?"; " eom.OPERATION_ID = ? AND eom.TENANT_ID = ? " +
"ORDER BY eom.UPDATED_TIMESTAMP DESC";
stmt = conn.prepareStatement(sql); stmt = conn.prepareStatement(sql);
stmt.setInt(1, operationId); stmt.setInt(1, operationId);

Loading…
Cancel
Save