Commit 18c4bc06 by Ryan Baxter Committed by Spencer Gibb

Upgrade hystrix 1.5.6 (#1388)

Fixes gh-1374
parent d23aa67f
...@@ -22,16 +22,14 @@ import java.io.OutputStream; ...@@ -22,16 +22,14 @@ import java.io.OutputStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.Map.Entry;
import javax.servlet.ServletInputStream; import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletRequestWrapper; import javax.servlet.ServletRequestWrapper;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.InputStreamResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
...@@ -44,6 +42,7 @@ import org.springframework.util.Assert; ...@@ -44,6 +42,7 @@ import org.springframework.util.Assert;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartRequest; import org.springframework.web.multipart.MultipartRequest;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
...@@ -121,7 +120,7 @@ public class FormBodyWrapperFilter extends ZuulFilter { ...@@ -121,7 +120,7 @@ public class FormBodyWrapperFilter extends ZuulFilter {
.getField(this.requestField, request); .getField(this.requestField, request);
wrapper = new FormBodyRequestWrapper(wrapped); wrapper = new FormBodyRequestWrapper(wrapped);
ReflectionUtils.setField(this.requestField, request, wrapper); ReflectionUtils.setField(this.requestField, request, wrapper);
if(request instanceof ServletRequestWrapper) { if (request instanceof ServletRequestWrapper) {
ReflectionUtils.setField(this.servletRequestField, request, wrapper); ReflectionUtils.setField(this.servletRequestField, request, wrapper);
} }
} }
...@@ -233,7 +232,7 @@ public class FormBodyWrapperFilter extends ZuulFilter { ...@@ -233,7 +232,7 @@ public class FormBodyWrapperFilter extends ZuulFilter {
Set<String> result = new HashSet<>(); Set<String> result = new HashSet<>();
String query = this.request.getQueryString(); String query = this.request.getQueryString();
if (query != null) { if (query != null) {
for (String value : StringUtils.split(query, "&")) { for (String value : StringUtils.tokenizeToStringArray(query, "&")) {
if (value.contains("=")) { if (value.contains("=")) {
value = value.substring(0, value.indexOf("=")); value = value.substring(0, value.indexOf("="));
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<archaius.version>0.7.4</archaius.version> <archaius.version>0.7.4</archaius.version>
<eureka.version>1.4.11</eureka.version> <eureka.version>1.4.11</eureka.version>
<feign.version>9.3.1</feign.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> <ribbon.version>2.2.0</ribbon.version>
<servo.version>0.10.1</servo.version> <servo.version>0.10.1</servo.version>
<zuul.version>1.2.2</zuul.version> <zuul.version>1.2.2</zuul.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment