Shahar Havivi has uploaded a new change for review. Change subject: findbugs: Null check of value previously dereferenced ......................................................................
findbugs: Null check of value previously dereferenced Change-Id: Ic5a1e4ea6f2338c53db028033297c48397354ef6 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java 3 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/14579/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java index 0689f1d..53bcc99 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java @@ -199,9 +199,9 @@ VdcActionParametersBase params) throws BackendFailureException { setCorrelationId(params); VdcReturnValueBase result = backend.RunAction(task, sessionize(params)); - if (!result.getCanDoAction()) { + if (result != null && !result.getCanDoAction()) { throw new BackendFailureException(localize(result.getCanDoActionMessages())); - } else if (!result.getSucceeded()) { + } else if (result != null && !result.getSucceeded()) { throw new BackendFailureException(localize(result.getExecuteFailedMessages())); } assert (result != null); diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java index f65a690..f22a616 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java @@ -71,7 +71,8 @@ public ArrayList<VdcQueryReturnValue> RunMultipleQueries( ArrayList<VdcQueryType> queryTypeList, ArrayList<VdcQueryParametersBase> queryParamsList) { - log.debug("Server: RunMultipleQuery invoked! [amount of queries: " + queryTypeList.size() + "]"); //$NON-NLS-1$ //$NON-NLS-2$ + int size = queryTypeList == null ? 0 : queryTypeList.size(); + log.debug("Server: RunMultipleQuery invoked! [amount of queries: " + size + "]"); //$NON-NLS-1$ //$NON-NLS-2$ ArrayList<VdcQueryReturnValue> ret = new ArrayList<VdcQueryReturnValue>(); if (queryTypeList == null || queryParamsList == null) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java index 057c80e..9651b86 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java @@ -174,7 +174,7 @@ StoragePool dataCenter = pools.get(0); setStoragePool(dataCenter); // show quota - if (dataCenter.getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED) { + if (dataCenter != null && dataCenter.getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED) { hasQuota = true; } if (hasQuota) { -- To view, visit http://gerrit.ovirt.org/14579 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5a1e4ea6f2338c53db028033297c48397354ef6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
