Fix NPE if handler returns explicit null response

alexa · Sep 7, 2018 · c70b0dd · c70b0dd
1 parent 9724ba5
commit c70b0dd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ask-sdk-core/src/com/amazon/ask/Skill.java b/ask-sdk-core/src/com/amazon/ask/Skill.java
@@ -88,7 +88,7 @@ public ResponseEnvelope invoke(RequestEnvelope requestEnvelope, Object context)
 
         Optional<Response> response = requestDispatcher.dispatch(handlerInput);
         return ResponseEnvelope.builder()
-                .withResponse(response.orElse(null))
+                .withResponse(response != null ? response.orElse(null) : null)
                 .withSessionAttributes
                         (requestEnvelope.getSession() != null ? handlerInput.getAttributesManager().getSessionAttributes() : null)
                 .withVersion(SdkConstants.FORMAT_VERSION)