Gilad Chaplik has uploaded a new change for review.

Change subject: restapi: NPE in setJobLink flow
......................................................................

restapi: NPE in setJobLink flow

Action should be initialized prior to setting a job id.

Change-Id: Iadfd502de54cd34d9cc5e4dc70d4bd6f52f83cf7
Signed-off-by: Gilad Chaplik <[email protected]>
---
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/29/20629/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..33c2335 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,11 +158,11 @@
                 return performNonBlockingAction(task, params, action);
             } else {
                 VdcReturnValueBase actionResult = doAction(task, params);
+                if (action == null) {
+                    action = new Action();
+                }
                 if (actionResult.getJobId() != null) {
                     setJobLink(action, actionResult);
-                }
-                if (action==null) {
-                    action = new Action();
                 }
                 action.setStatus(StatusUtils.create(CreationStatus.COMPLETE));
                 if (getEntityWhenDone) {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadfd502de54cd34d9cc5e4dc70d4bd6f52f83cf7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to