diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyGracefulShutdown.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyGracefulShutdown.java index 52c0f813fde..bb203a33d1e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyGracefulShutdown.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyGracefulShutdown.java @@ -74,7 +74,7 @@ class JettyGracefulShutdown implements GracefulShutdown { return true; } if (logger.isInfoEnabled()) { - logger.info("Grace period elaped with " + activeRequests + " request(s) still active"); + logger.info("Grace period elapsed with " + activeRequests + " request(s) still active"); } return activeRequests == 0; } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java index e4870b5d5af..c26a596f653 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java @@ -143,7 +143,7 @@ class JettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactor blockingHandler.completeOne(); responseLatch.await(5, TimeUnit.SECONDS); this.webServer.stop(); - Throwable error = await().atMost(Duration.ofSeconds(5)).until(errorReference::get, (ex) -> ex != null); + Throwable error = await().atMost(Duration.ofSeconds(30)).until(errorReference::get, (ex) -> ex != null); assertThat(error).isInstanceOf(IOException.class); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java index b2d288fa496..a574226ed85 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java @@ -520,7 +520,6 @@ public abstract class AbstractReactiveWebServerFactoryTests { public void completeOne() { try { MonoProcessor processor = this.monoProcessors.take(); - System.out.println("Completing " + processor); processor.onComplete(); } catch (InterruptedException ex) {