Browse Source

Polish

See gh-4657
pull/20434/head
Andy Wilkinson 6 years ago
parent
commit
da06b38117
  1. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyGracefulShutdown.java
  2. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java
  3. 1
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java

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

@ -74,7 +74,7 @@ class JettyGracefulShutdown implements GracefulShutdown { @@ -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

@ -143,7 +143,7 @@ class JettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactor @@ -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

@ -520,7 +520,6 @@ public abstract class AbstractReactiveWebServerFactoryTests { @@ -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) {

Loading…
Cancel
Save