|
|
@ -1500,11 +1500,6 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
|
|
|
deviceIdentifiers.put(deviceId, rs.getString("DEVICE_IDENTIFICATION"));
|
|
|
|
deviceIdentifiers.put(deviceId, rs.getString("DEVICE_IDENTIFICATION"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (SQLException e) {
|
|
|
|
|
|
|
|
String msg = "Error occurred while retrieving group details and device IDs for group: " + groupName;
|
|
|
|
|
|
|
|
log.error(msg, e);
|
|
|
|
|
|
|
|
throw new GroupManagementDAOException(msg, e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
groupDetails.setDeviceIds(deviceIds);
|
|
|
|
groupDetails.setDeviceIds(deviceIds);
|
|
|
|
groupDetails.setDeviceCount(deviceIds.size());
|
|
|
|
groupDetails.setDeviceCount(deviceIds.size());
|
|
|
|
groupDetails.setDeviceOwners(deviceOwners);
|
|
|
|
groupDetails.setDeviceOwners(deviceOwners);
|
|
|
@ -1514,4 +1509,10 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
|
|
|
groupDetails.setDeviceIdentifiers(deviceIdentifiers);
|
|
|
|
groupDetails.setDeviceIdentifiers(deviceIdentifiers);
|
|
|
|
return groupDetails;
|
|
|
|
return groupDetails;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (SQLException e) {
|
|
|
|
|
|
|
|
String msg = "Error occurred while retrieving group details and device IDs for group: " + groupName;
|
|
|
|
|
|
|
|
log.error(msg, e);
|
|
|
|
|
|
|
|
throw new GroupManagementDAOException(msg, e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|