Fix processing of line immediately after # in properties file

Fixes gh-24158
spring-projects · Nov 18, 2020 · e342d7d · e342d7d
1 parent c86ce27
commit e342d7d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/...spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java b/...spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java
@@ -168,8 +168,10 @@ boolean isNewDocument(CharacterReader reader) throws IOException {
 		result = result && readAndExpect(reader, reader::isHyphenCharacter);
 		result = result && readAndExpect(reader, reader::isHyphenCharacter);
 		result = result && readAndExpect(reader, reader::isHyphenCharacter);
-		reader.read();
-		reader.skipWhitespace();
+		if (!reader.isEndOfLine()) {
+			reader.read();
+			reader.skipWhitespace();
+		}
 		return result && reader.isEndOfLine();
 	}
 

diff --git a/...g-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java b/...g-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java
@@ -293,6 +293,12 @@ void existingCommentsAreNotTreatedAsMultiDoc() throws Exception {
 		assertThat(this.documents.size()).isEqualTo(1);
 	}
 
+	@Test
+	void getPropertyAfterPoundCharacter() {
+		OriginTrackedValue value = getFromFirst("test-line-after-empty-pound");
+		assertThat(getValue(value)).isEqualTo("abc");
+	}
+
 	private OriginTrackedValue getFromFirst(String key) {
 		return this.documents.get(0).asMap().get(key);
 	}

diff --git a/...ct/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties b/...ct/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties
@@ -43,3 +43,6 @@ test-iso8859-1-chars=
 
 test-with-trailing-space= trailing 
 test-with-escaped-trailing-space= trailing\ 
+
+#
+test-line-after-empty-pound=abc