From 285f8d96fc1654945b80a80231eca83908ac9985 Mon Sep 17 00:00:00 2001 From: Jeff Schwartz Date: Wed, 27 Jun 2018 23:37:38 -0400 Subject: [PATCH] #168 - Fixed NPE when no query params are sent with the request --- .../internal/servlet/AwsProxyHttpServletRequest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java index 3c474d9cd..a57ed5adf 100644 --- a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java +++ b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java @@ -816,9 +816,11 @@ private String getQueryParamValue(String key, boolean isCaseSensitive) { return request.getQueryStringParameters().get(key); } - for (String k : request.getQueryStringParameters().keySet()) { - if (k.toLowerCase(Locale.getDefault()).equals(key.toLowerCase(Locale.getDefault()))) { - return request.getQueryStringParameters().get(k); + if (request.getQueryStringParameters() != null) { + for (String k : request.getQueryStringParameters().keySet()) { + if (k.toLowerCase(Locale.getDefault()).equals(key.toLowerCase(Locale.getDefault()))) { + return request.getQueryStringParameters().get(k); + } } }