Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the null pointer in operations json list. #405

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -746,13 +746,25 @@ private ComplexAttribute buildComplexValue(AttributeSchema attributeSchema,
*/
public ArrayList<PatchOperation> decodeRequest(String scimResourceString) throws BadRequestException {


ArrayList<PatchOperation> operationList = new ArrayList<PatchOperation>();
try {
//decode the string into json representation
JSONObject decodedJsonObj = new JSONObject(new JSONTokener(scimResourceString));
//obtain the Operations values
JSONArray operationJsonList = (JSONArray) decodedJsonObj.opt(SCIMConstants.OperationalConstants.OPERATIONS);

//check if operationJsonList is null
if (operationJsonList == null) {

//check if operations field present in lowercase
if (decodedJsonObj.has(StringUtils.lowerCase(SCIMConstants.OperationalConstants.OPERATIONS))) {
throw new BadRequestException("Invalid JSON schema.", ResponseCodeConstants.INVALID_SYNTAX);
}

throw new BadRequestException(ResponseCodeConstants.INVALID_SYNTAX);
}


//for each operation, create a PatchOperation object and add the relevant values to it
for (int count = 0; count < operationJsonList.length(); count++) {
JSONObject operation = (JSONObject) operationJsonList.get(count);
Expand Down
Loading