Merge branch '2.6.x' into 2.7.x

wilkinsona · wilkinsona · commit 8d93040c59fe · 2022-08-04T11:46:56.000+01:00
Closes gh-31984
diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java
@@ -52,10 +52,11 @@ public void afterPropertiesSet() throws Exception {
 	void startServer() {
 		if (this.server != null) {
 			try {
+				int port = this.server.getPort();
 				if (!this.server.isStarted()) {
-					this.server.start();
+					port = this.server.start();
 				}
-				logger.info(LogMessage.format("LiveReload server is running on port %s", this.server.getPort()));
+				logger.info(LogMessage.format("LiveReload server is running on port %s", port));
 			}
 			catch (Exception ex) {
 				logger.warn("Unable to start LiveReload server");

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,11 @@ public void afterPropertiesSet() throws Exception {`
`52`	`52`	`void startServer() {`
`53`	`53`	`if (this.server != null) {`
`54`	`54`	`try {`
	`55`	`+ int port = this.server.getPort();`
`55`	`56`	`if (!this.server.isStarted()) {`
`56`		`- this.server.start();`
	`57`	`+ port = this.server.start();`
`57`	`58`	`}`
`58`		`- logger.info(LogMessage.format("LiveReload server is running on port %s", this.server.getPort()));`
	`59`	`+ logger.info(LogMessage.format("LiveReload server is running on port %s", port));`
`59`	`60`	`}`
`60`	`61`	`catch (Exception ex) {`
`61`	`62`	`logger.warn("Unable to start LiveReload server");`