Commit 4d0da4b7 authored by Yuyan's avatar Yuyan Committed by Phillip Webb

Simplify code

See gh-18342
parent a0957d9b
...@@ -143,8 +143,8 @@ class BootArchiveSupport { ...@@ -143,8 +143,8 @@ class BootArchiveSupport {
} }
private boolean isZip(InputStream inputStream) throws IOException { private boolean isZip(InputStream inputStream) throws IOException {
for (int i = 0; i < ZIP_FILE_HEADER.length; i++) { for (byte b : ZIP_FILE_HEADER) {
if (inputStream.read() != ZIP_FILE_HEADER[i]) { if (inputStream.read() != b) {
return false; return false;
} }
} }
......
...@@ -544,14 +544,7 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory ...@@ -544,14 +544,7 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory
@Test @Test
void registerJspServletWithDefaultLoadOnStartup() { void registerJspServletWithDefaultLoadOnStartup() {
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0); TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0);
factory.addInitializers(new ServletContextInitializer() { factory.addInitializers(servletContext -> servletContext.addServlet("manually-registered-jsp-servlet", JspServlet.class));
@Override
public void onStartup(ServletContext servletContext) throws ServletException {
servletContext.addServlet("manually-registered-jsp-servlet", JspServlet.class);
}
});
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
this.webServer.start(); this.webServer.start();
} }
......
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