Sahina Bose has uploaded a new change for review.

Change subject: restapi: Fix NPE while setting job links
......................................................................

restapi: Fix NPE while setting job links

While adding job links, if action is null
there could be NPE, so making sure
action is initialized before call to
setJobLinks

Change-Id: I21c643e1ce6a3e77b69cd43bcc932de8da40b99a
Signed-off-by: Sahina Bose <sab...@redhat.com>
---
M 
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/20646/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 c0ff73c..ec87ffb 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
@@ -158,12 +158,12 @@
                 return performNonBlockingAction(task, params, action);
             } else {
                 VdcReturnValueBase actionResult = doAction(task, params);
-                if (actionResult.getJobId() != null) {
-                    setJobLink(action, actionResult);
-                }
                 if (action==null) {
                     action = new Action();
                 }
+                if (actionResult.getJobId() != null) {
+                    setJobLink(action, actionResult);
+                }
                 action.setStatus(StatusUtils.create(CreationStatus.COMPLETE));
                 if (getEntityWhenDone) {
                     setActionItem(action, getEntity());


-- 
To view, visit http://gerrit.ovirt.org/20646
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21c643e1ce6a3e77b69cd43bcc932de8da40b99a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sahina Bose <sab...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to