Frank Kobzik has uploaded a new change for review. Change subject: api: Prevent NPEx when using reloadconfigurations res ......................................................................
api: Prevent NPEx when using reloadconfigurations res When trying to reload configuration via restapi, NPEx occurs since ApiResource is missing in TYPES collection. This patch solves the issue by adding ApiResource to TYPES collection. Change-Id: Ia46ee81910adc8dd3d6f09cb63d9b5b4ca1ae849 Signed-off-by: Frantisek Kobzik <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/34202/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java index 2c8b925..9b43156 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java @@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.api.model.API; import org.ovirt.engine.api.model.ActionableResource; import org.ovirt.engine.api.model.ActionsBuilder; import org.ovirt.engine.api.model.AffinityGroup; @@ -97,6 +98,7 @@ import org.ovirt.engine.api.model.Weight; import org.ovirt.engine.api.resource.AffinityGroupResource; import org.ovirt.engine.api.resource.AffinityGroupsResource; +import org.ovirt.engine.api.resource.ApiResource; import org.ovirt.engine.api.resource.AssignedNetworkResource; import org.ovirt.engine.api.resource.AssignedNetworksResource; import org.ovirt.engine.api.resource.AssignedPermissionsResource; @@ -301,6 +303,9 @@ map = new ParentToCollectionMap(HostResource.class, HostsResource.class); TYPES.put(Host.class, map); + map = new ParentToCollectionMap(ApiResource.class, ApiResource.class); + TYPES.put(API.class, map); + map = new ParentToCollectionMap(HostNicResource.class, HostNicsResource.class, Host.class); TYPES.put(HostNIC.class, map); -- To view, visit http://gerrit.ovirt.org/34202 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia46ee81910adc8dd3d6f09cb63d9b5b4ca1ae849 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
