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
c12bb77c
Commit
c12bb77c
authored
Feb 11, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15885 from Christoph Dreis
* gh-15885: Clean up SpringPropertyAction.getValue() Closes gh-15885
parents
648cbaac
3fb87a45
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
12 deletions
+2
-12
SpringPropertyAction.java
...gframework/boot/logging/logback/SpringPropertyAction.java
+2
-12
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java
View file @
c12bb77c
/*
* Copyright 2012-201
8
the original author or authors.
* Copyright 2012-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -65,17 +65,7 @@ class SpringPropertyAction extends Action {
addWarn
(
"No Spring Environment available to resolve "
+
source
);
return
defaultValue
;
}
String
value
=
this
.
environment
.
getProperty
(
source
);
if
(
value
!=
null
)
{
return
value
;
}
int
lastDot
=
source
.
lastIndexOf
(
'.'
);
if
(
lastDot
>
0
)
{
String
prefix
=
source
.
substring
(
0
,
lastDot
+
1
);
return
this
.
environment
.
getProperty
(
prefix
+
source
.
substring
(
lastDot
+
1
),
defaultValue
);
}
return
defaultValue
;
return
this
.
environment
.
getProperty
(
source
,
defaultValue
);
}
@Override
...
...
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