Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Closes gh-18554
This commit is contained in:
Andy Wilkinson
2019-10-10 07:29:57 -05:00
parent 2229b8fa4e a7d199330a
commit e62ca778e9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/support/ErrorPageFilterIntegrationTests.java
View File

@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletResponse;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.xnio.channels.UnsupportedOptionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -190,7 +189,7 @@ class ErrorPageFilterIntegrationTests {
@Override
public ApplicationContext loadContext(String... locations) {
throw new UnsupportedOptionException();
throw new UnsupportedOperationException();
}
@Override
@@ -200,7 +199,7 @@ class ErrorPageFilterIntegrationTests {
@Override
protected String getResourceSuffix() {
throw new UnsupportedOptionException();
throw new UnsupportedOperationException();
}
}