From 2c364ceb89275ea3eac047a84d4e332e24c3e26d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 27 May 2019 16:58:55 +0200 Subject: [PATCH] Fix wrong ApplicationContext import Closes gh-16978 --- .../boot/web/servlet/server/ServletWebServerFactory.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java index c16584d1724..96651d16bfe 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/ServletWebServerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.boot.web.servlet.server; -import org.apache.catalina.core.ApplicationContext; - import org.springframework.boot.web.server.WebServer; import org.springframework.boot.web.servlet.ServletContextInitializer; @@ -34,7 +32,7 @@ public interface ServletWebServerFactory { /** * Gets a new fully configured but paused {@link WebServer} instance. Clients should * not be able to connect to the returned server until {@link WebServer#start()} is - * called (which happens when the {@link ApplicationContext} has been fully + * called (which happens when the {@code ApplicationContext} has been fully * refreshed). * @param initializers {@link ServletContextInitializer}s that should be applied as * the server starts