Merge branch '2.6.x' into 2.7.x

Closes gh-31984
spring-projects · Aug 4, 2022 · 8d93040 · 8d93040
2 parents cd59854 + 7c0ccdf
commit 8d93040
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...c/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java b/...c/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");