Tomas Jelinek has uploaded a new change for review. Change subject: webadmin: fixed Coverity Scan errors ......................................................................
webadmin: fixed Coverity Scan errors removed some NPE vulnerabilities and unchecked casts Change-Id: I9e3a6438f23c530e637d557039131442ea3a73e3 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CustomInstanceType.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 3 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/27450/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index af8be5f..da9e603 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -1320,6 +1320,10 @@ object.getPropertyChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { + if (args == null || !(args instanceof PropertyChangedEventArgs)) { + return; + } + String propName = ((PropertyChangedEventArgs) args).propertyName; if ("IsHostTabValid".equals(propName)) { //$NON-NLS-1$ if (object.getIsHostTabValid()) { @@ -1380,6 +1384,10 @@ @Override public void eventRaised(Event ev, Object sender, EventArgs args) { + if (args == null || !(args instanceof PropertyChangedEventArgs)) { + return; + } + PropertyChangedEventArgs e = (PropertyChangedEventArgs) args; if (e.propertyName == "SelectedItem") { //$NON-NLS-1$ @@ -1404,6 +1412,10 @@ object.getCpuSharesAmountSelection().getPropertyChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { + if (args == null || !(args instanceof PropertyChangedEventArgs)) { + return; + } + if ("IsAvailable".equals(((PropertyChangedEventArgs) args).propertyName)) { //$NON-NLS-1$ changeApplicationLevelVisibility(cpuSharesEditor, object.getCpuSharesAmountSelection().getIsAvailable()); } @@ -1532,6 +1544,10 @@ vm.getPropertyChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { + if (args == null || !(args instanceof PropertyChangedEventArgs)) { + return; + } + String propName = ((PropertyChangedEventArgs) args).propertyName; if ("IsLinuxOS".equals(propName)) { //$NON-NLS-1$ changeApplicationLevelVisibility(linuxBootOptionsPanel, vm.getIsLinuxOS()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CustomInstanceType.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CustomInstanceType.java index 10158a3..1ba62f1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CustomInstanceType.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CustomInstanceType.java @@ -115,7 +115,8 @@ @Override public BootSequence getDefaultBootSequence() { - return null; + // default boot sequence + return BootSequence.C; } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 2833ed6..15feab0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -632,7 +632,7 @@ if (quotaList != null && !quotaList.isEmpty()) { vmModel.getQuota().setItems(quotaList); } - if (defaultQuota != null && !Guid.Empty.equals(defaultQuota)) { + if (quotaList != null && defaultQuota != null && !Guid.Empty.equals(defaultQuota)) { boolean hasQuotaInList = false; for (Quota quota : quotaList) { if (quota.getId().equals(defaultQuota)) { -- To view, visit http://gerrit.ovirt.org/27450 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e3a6438f23c530e637d557039131442ea3a73e3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches