Michael Pasternak has uploaded a new change for review. Change subject: restapi: prevent NPE in rsdl gen when missing body params ......................................................................
restapi: prevent NPE in rsdl gen when missing body params Change-Id: Id3fff227bb3dc21da16953f1aa1dfaeed5cd4709 Signed-off-by: Michael pasternak <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/17825/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java index 3760db9..0c88ee2 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java @@ -611,7 +611,21 @@ String link1ParamType = link1.getRequest().getBody().getType(); String link2ParamType = link2.getRequest().getBody().getType(); //Verify for both links that body is not mandatory - if ( (link1.getRequest().getBody().isRequired()==false) && (link2.getRequest().getBody().isRequired()==false) ){ + if ( ( + (link1.getRequest().getBody().isRequired() != null) + && + (link2.getRequest().getBody().isRequired() != null) + ) + + && + + ( + (link1.getRequest().getBody().isRequired() == Boolean.FALSE) + && + (link2.getRequest().getBody().isRequired() == Boolean.FALSE) + ) + ) + { if (link1ParamType!=null && link2ParamType==null) { return link2; } -- To view, visit http://gerrit.ovirt.org/17825 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3fff227bb3dc21da16953f1aa1dfaeed5cd4709 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
