From 78e4cb4410f28d0f1d01fdb7f929407ca516494b Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 12 Sep 2017 17:50:46 -0600
Subject: [PATCH] Fix for potential NPE

---
 .../cloud/netflix/zuul/util/RequestContentDataExtractor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java
index b2aad040..a6efb16d 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java
@@ -31,7 +31,7 @@ public class RequestContentDataExtractor {
         for (Entry<String, String[]> entry : request.getParameterMap().entrySet()) {
             String key = entry.getKey();
 
-            if (!queryParams.contains(key)) {
+            if (!queryParams.contains(key) && entry.getValue() != null) {
                 for (String value : entry.getValue()) {
                     builder.add(key, value);
                 }