Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e342d7d2
Commit
e342d7d2
authored
Nov 18, 2020
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix processing of line immediately after # in properties file
Fixes gh-24158
parent
c86ce271
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
OriginTrackedPropertiesLoader.java
...ringframework/boot/env/OriginTrackedPropertiesLoader.java
+4
-2
OriginTrackedPropertiesLoaderTests.java
...ramework/boot/env/OriginTrackedPropertiesLoaderTests.java
+6
-0
test-properties.properties
...s/org/springframework/boot/env/test-properties.properties
+3
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedPropertiesLoader.java
View file @
e342d7d2
...
...
@@ -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
();
}
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/OriginTrackedPropertiesLoaderTests.java
View file @
e342d7d2
...
...
@@ -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
);
}
...
...
spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/env/test-properties.properties
View file @
e342d7d2
...
...
@@ -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
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment