From dfcc7c5c2ddcfcdea4ca240eae4b8f3626f19640 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Mon, 11 Nov 2024 12:18:04 +0900
Subject: [PATCH] Fix WebServerPortFileWriter.getPortFile() without extension

See gh-43115
---
 .../boot/web/context/WebServerPortFileWriter.java        | 4 +++-
 .../boot/web/context/WebServerPortFileWriterTests.java   | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerPortFileWriter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerPortFileWriter.java
index 0ec76343ebe..87edb86d743 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerPortFileWriter.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerPortFileWriter.java
@@ -110,7 +110,9 @@ public class WebServerPortFileWriter implements ApplicationListener<WebServerIni
 		}
 		String name = this.file.getName();
 		String extension = StringUtils.getFilenameExtension(this.file.getName());
-		name = name.substring(0, name.length() - extension.length() - 1);
+		if (extension != null) {
+			name = name.substring(0, name.length() - extension.length() - 1);
+		}
 		if (isUpperCase(name)) {
 			name = name + "-" + namespace.toUpperCase(Locale.ENGLISH);
 		}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/WebServerPortFileWriterTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/WebServerPortFileWriterTests.java
index a791a9b7848..90f20828dab 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/WebServerPortFileWriterTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/WebServerPortFileWriterTests.java
@@ -110,6 +110,15 @@ class WebServerPortFileWriterTests {
 		assertThat(collectFileNames(file.getParentFile())).contains(managementFile);
 	}
 
+	@Test
+	void getPortFileWhenPortFileNameDoesNotHaveExtension() {
+		File file = new File(this.tempDir, "portfile");
+		WebServerPortFileWriter listener = new WebServerPortFileWriter(file);
+		WebServerApplicationContext applicationContext = mock(WebServerApplicationContext.class);
+		given(applicationContext.getServerNamespace()).willReturn("management");
+		assertThat(listener.getPortFile(applicationContext).getName()).isEqualTo("portfile-management");
+	}
+
 	private WebServerInitializedEvent mockEvent(String namespace, int port) {
 		WebServer webServer = mock(WebServer.class);
 		given(webServer.getPort()).willReturn(port);