root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

This commit is contained in:
Stephane Nicoll 2021-01-15 14:37:25 +01:00
parent 2de8c49d9f e8ae18ae11
commit 1a2a3d6598
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -8442,7 +8442,7 @@ The following example shows how to use the `ConditionEvaluationReportLoggingList
[source,java,indent=0] [source,java,indent=0]
---- ----
@Test @Test
public void autoConfigTest { void autoConfigTest() {
ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener( ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener(
LogLevel.INFO); LogLevel.INFO);
ApplicationContextRunner contextRunner = new ApplicationContextRunner() ApplicationContextRunner contextRunner = new ApplicationContextRunner()

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

@ -286,7 +286,7 @@ public class JettyWebServer implements WebServer {
.invokeMethod(ReflectionUtils.findMethod(connector.getClass(), "getLocalPort"), connector); .invokeMethod(ReflectionUtils.findMethod(connector.getClass(), "getLocalPort"), connector);
} }
catch (Exception ex) { catch (Exception ex) {
logger.info("could not determine port ( " + ex.getMessage() + ")"); logger.info("could not determine port (" + ex.getMessage() + ")");
} }
return 0; return 0;
} }