Allon Mureinik has uploaded a new change for review. Change subject: core: OvfReader cleanup - remove unused parameter ......................................................................
core: OvfReader cleanup - remove unused parameter Removed the vmDevice parameter from the getResourceType method. This method is private, and the parameter is not used, so we can be sure it is not required. Change-Id: Iaa9872617cc62539b2b8c33c5dbe2df21db355bb Relates-To: https://bugzilla.redhat.com/72506 Signed-off-by: Allon Mureinik <amure...@redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/9307/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index 5a44555..3572dbb 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -207,7 +207,7 @@ && !StringUtils.isEmpty(node.SelectSingleNode(OvfProperties.VMD_TYPE, _xmlNS).InnerText)) { vmDevice.setType(String.valueOf(node.SelectSingleNode(OvfProperties.VMD_TYPE, _xmlNS).InnerText)); } else { - int resourceType = getResourceType(node, vmDevice, OvfProperties.VMD_RESOURCE_TYPE); + int resourceType = getResourceType(node, OvfProperties.VMD_RESOURCE_TYPE); vmDevice.setType(VmDeviceType.getoVirtDevice(resourceType).getName()); } if (node.SelectSingleNode(OvfProperties.VMD_DEVICE, _xmlNS) != null @@ -444,7 +444,7 @@ } } - private int getResourceType(XmlNode node, VmDevice vmDevice, String resource) { + private int getResourceType(XmlNode node, String resource) { if (node.SelectSingleNode(resource, _xmlNS) != null && !StringUtils.isEmpty(node.SelectSingleNode(resource, _xmlNS).InnerText)) { return Integer.valueOf(node.SelectSingleNode(resource, _xmlNS).InnerText); @@ -453,8 +453,8 @@ } private void setDeviceByResource(XmlNode node, VmDevice vmDevice) { - int resourceType = getResourceType(node, vmDevice, OvfProperties.VMD_RESOURCE_TYPE); - int resourceSubType = getResourceType(node, vmDevice, OvfProperties.VMD_SUB_RESOURCE_TYPE); + int resourceType = getResourceType(node, OvfProperties.VMD_RESOURCE_TYPE); + int resourceSubType = getResourceType(node, OvfProperties.VMD_SUB_RESOURCE_TYPE); if (resourceSubType == -1) { // we need special handling for Monitor to define it as vnc or spice if (Integer.valueOf(OvfHardware.Monitor) == resourceType) { -- To view, visit http://gerrit.ovirt.org/9307 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa9872617cc62539b2b8c33c5dbe2df21db355bb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amure...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
