From 99b86e7a29e3864a351291e7141750b4b96ec1ba Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Mon, 10 Oct 2016 15:31:42 -0400
Subject: [PATCH] Fixes #1374

---
 .../filters/pre/FormBodyWrapperFilter.java    | 45 ++++++++++---------
 spring-cloud-netflix-dependencies/pom.xml     |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java
index 22681762..dfe88c7d 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/FormBodyWrapperFilter.java
@@ -16,22 +16,10 @@
 
 package org.springframework.cloud.netflix.zuul.filters.pre;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
-
-import org.apache.commons.lang3.StringUtils;
+import com.netflix.zuul.ZuulFilter;
+import com.netflix.zuul.context.RequestContext;
+import com.netflix.zuul.http.HttpServletRequestWrapper;
+import com.netflix.zuul.http.ServletInputStreamWrapper;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
@@ -44,14 +32,23 @@ import org.springframework.util.Assert;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ReflectionUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 import org.springframework.web.servlet.DispatcherServlet;
 
-import com.netflix.zuul.ZuulFilter;
-import com.netflix.zuul.context.RequestContext;
-import com.netflix.zuul.http.HttpServletRequestWrapper;
-import com.netflix.zuul.http.ServletInputStreamWrapper;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestWrapper;
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
 
 /**
  * @author Spencer Gibb
@@ -232,8 +229,12 @@ public class FormBodyWrapperFilter extends ZuulFilter {
 		private Set<String> findQueryParams() {
 			Set<String> result = new HashSet<>();
 			String query = this.request.getQueryString();
-			if (query != null) {
-				for (String value : StringUtils.split(query, "&")) {
+			String[] splitQuery = StringUtils.split(query, "&");
+			if(splitQuery == null && query != null) {
+				splitQuery = new String[]{query};
+			}
+			if (splitQuery != null) {
+				for (String value : splitQuery) {
 					if (value.contains("=")) {
 						value = value.substring(0, value.indexOf("="));
 					}
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 99e3cb2d..094bee0e 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -17,7 +17,7 @@
 		<archaius.version>0.7.4</archaius.version>
 		<eureka.version>1.4.11</eureka.version>
 		<feign.version>9.3.1</feign.version>
-		<hystrix.version>1.5.5</hystrix.version>
+		<hystrix.version>1.5.6</hystrix.version>
 		<ribbon.version>2.2.0</ribbon.version>
 		<servo.version>0.10.1</servo.version>
 		<zuul.version>1.2.2</zuul.version>