Yair Zaslavsky has uploaded a new change for review. Change subject: core: Fix potential NPE ......................................................................
core: Fix potential NPE This defect was reported by coverity Change-Id: I5b49cf88d71217afd9c78e6a7103194b83915e7a Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncTaskStatusQueryBase.java 1 file changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/22281/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncTaskStatusQueryBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncTaskStatusQueryBase.java index 8cd6d04..b85b6aa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncTaskStatusQueryBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterAsyncTaskStatusQueryBase.java @@ -108,21 +108,22 @@ } private void updateLatestStatus(GlusterVolumeTaskStatusEntity status) { - GlusterAsyncTask asyncTask = volume.getAsyncTask(); GlusterTaskParameters taskParameters = new GlusterTaskParameters(); taskParameters.setVolumeName(volume.getName()); - asyncTask.setTaskParameters(taskParameters); + GlusterAsyncTask asyncTask = volume.getAsyncTask(); + if (asyncTask != null) { + asyncTask.setTaskParameters(taskParameters); + if (asyncTask.getTaskId() != null) { + List<Step> stepsList = getStepDao().getStepsByExternalId(asyncTask.getTaskId()); - if (asyncTask != null && asyncTask.getTaskId() != null) { - List<Step> stepsList = getStepDao().getStepsByExternalId(asyncTask.getTaskId()); - - asyncTask.setStatus(status.getStatusSummary().getStatus()); - asyncTask.setMessage(GlusterTaskUtils.getInstance().getSummaryMessage(status.getStatusSummary())); - getGlusterTaskUtils().updateSteps(getClusterDao().get(clusterId), asyncTask, stepsList); + asyncTask.setStatus(status.getStatusSummary().getStatus()); + asyncTask.setMessage(GlusterTaskUtils.getInstance().getSummaryMessage(status.getStatusSummary())); + getGlusterTaskUtils().updateSteps(getClusterDao().get(clusterId), asyncTask, stepsList); // release the volume lock if the task is completed - if (getGlusterTaskUtils().hasTaskCompleted(asyncTask)) { - getGlusterTaskUtils().releaseLock(volume.getId()); + if (getGlusterTaskUtils().hasTaskCompleted(asyncTask)) { + getGlusterTaskUtils().releaseLock(volume.getId()); + } } } } -- To view, visit http://gerrit.ovirt.org/22281 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b49cf88d71217afd9c78e6a7103194b83915e7a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
