Skip to content

fix(Pinpoint): Add null check for endpoint response #2704

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 12, 2021
Merged

fix(Pinpoint): Add null check for endpoint response #2704

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4b502d
null check for endpoint response
changxu0306 Nov 10, 2021
3c56b4d
add empty check
changxu0306 Nov 10, 2021
7900c23
add null check for results
changxu0306 Nov 11, 2021
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
23 changes: 20 additions & 3 deletions ...t/src/main/java/com/amazonaws/mobileconnectors/pinpoint/internal/event/EventRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import com.amazonaws.services.pinpoint.model.EventItemResponse;
import com.amazonaws.services.pinpoint.model.EventsBatch;
import com.amazonaws.services.pinpoint.model.EventsRequest;
import com.amazonaws.services.pinpoint.model.ItemResponse;
import com.amazonaws.services.pinpoint.model.PublicEndpoint;
import com.amazonaws.services.pinpoint.model.PutEventsRequest;
import com.amazonaws.services.pinpoint.model.PutEventsResult;
Expand Down Expand Up @@ -436,12 +437,28 @@ private void submitEventsAndEndpoint(final JSONArray eventArray,
}

private void processEndpointResponse(EndpointProfile endpoint, PutEventsResult resultResponse) {
final EndpointItemResponse endpointItemResponse = resultResponse
final Map<String, ItemResponse> results = resultResponse
.getEventsResponse()
.getResults()
.getResults();
if (results == null || results.isEmpty()) {
log.error("PutEventsResult is empty!");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we write a unit test for this?

return;
}

if (endpoint.getEndpointId().isEmpty()) {
log.error("EndpointId is missing!");
return;
}

final EndpointItemResponse endpointItemResponse = results
.get(endpoint.getEndpointId())
.getEndpointItemResponse();
if(202 == endpointItemResponse.getStatusCode()) {
if (endpointItemResponse == null) {
log.error("EndPointItemResponse is null!");
return;
}

if (202 == endpointItemResponse.getStatusCode()) {
log.info("EndpointProfile updated successfully.");
} else {
log.error("AmazonServiceException occurred during endpoint update: " +
Expand Down