Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix processing of line immediately after # in properties file

Browse Source 
Fixes gh-24158
This commit is contained in:
Madhura Bhave
2020-11-18 11:22:04 -08:00
parent c86ce27117
commit e342d7d262
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java vendored
View File

@@ -168,8 +168,10 @@ class OriginTrackedPropertiesLoader {
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();
}

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java vendored
View File

@@ -293,6 +293,12 @@ class OriginTrackedPropertiesLoaderTests {
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);
}

3
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties vendored
View File

@@ -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