root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Andy Wilkinson 2017-05-12 15:00:58 +01:00
parent 1c48e5aad7 a3f5cbc4a2
commit a2e749940e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.jersey; package org.springframework.boot.autoconfigure.jersey;
import java.nio.charset.Charset;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@ -105,7 +107,7 @@ public class JerseyAutoConfigurationServletContainerTests {
jerseyServlet.setServlet(new ServletContainer()); jerseyServlet.setServlet(new ServletContainer());
jerseyServlet.setOverridable(false); jerseyServlet.setOverridable(false);
context.addChild(jerseyServlet); context.addChild(jerseyServlet);
String pattern = UDecoder.URLDecode("/*", "UTF-8"); String pattern = UDecoder.URLDecode("/*", Charset.forName("UTF-8"));
context.addServletMappingDecoded(pattern, servletName); context.addServletMappingDecoded(pattern, servletName);
} }