Moti Asayag has uploaded a new change for review. Change subject: restapi: Fix findbug error - wrong key type ......................................................................
restapi: Fix findbug error - wrong key type The key type should be a Guid instead of the String which is passed to query map of type Map<Guid, VdsNetworkInterface>. Change-Id: If29de8662dfcdf58f063e09083d241f91e4a8ebf Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/23525/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java index ea301f4..be96457 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java @@ -26,6 +26,7 @@ import org.ovirt.engine.api.resource.ActionResource; import org.ovirt.engine.api.resource.HostNicResource; import org.ovirt.engine.api.resource.HostNicsResource; +import org.ovirt.engine.api.restapi.utils.GuidUtils; import org.ovirt.engine.core.common.action.AddBondParameters; import org.ovirt.engine.core.common.action.RemoveBondParameters; import org.ovirt.engine.core.common.action.SetupNetworksParameters; @@ -393,8 +394,11 @@ if (nic.isSetName() && nicsByName.containsKey(nic.getName())) { iface.setLabels(nicsByName.get(nic.getName()).getLabels()); - } else if (nic.isSetId() && nicsById.containsKey(nic.getId())) { - iface.setLabels(nicsById.get(nic.getId()).getLabels()); + } else if (nic.isSetId()) { + Guid nicId = GuidUtils.asGuid(nic.getId()); + if (nicsById.containsKey(nicId)) { + iface.setLabels(nicsById.get(nicId).getLabels()); + } } } -- To view, visit http://gerrit.ovirt.org/23525 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If29de8662dfcdf58f063e09083d241f91e4a8ebf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
