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

Polish

Browse Source 
See gh-4657
This commit is contained in:
Andy Wilkinson
2020-03-09 18:36:04 +00:00
parent 308e1d3675
commit da06b38117
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyGracefulShutdown.java
View File

@@ -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;
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java
View File

@@ -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);
}

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
View File

@@ -520,7 +520,6 @@ public abstract class AbstractReactiveWebServerFactoryTests {
public void completeOne() {
try {
MonoProcessor<Void> processor = this.monoProcessors.take();
System.out.println("Completing " + processor);
processor.onComplete();
}
catch (InterruptedException ex) {