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
5a7dece1
Commit
5a7dece1
authored
Dec 15, 2015
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting
parent
19056a11
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
SpringApplication.java
...main/java/org/springframework/boot/SpringApplication.java
+2
-2
ConfigFileApplicationListener.java
...rk/boot/context/config/ConfigFileApplicationListener.java
+0
-2
No files found.
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @
5a7dece1
...
@@ -546,8 +546,8 @@ public class SpringApplication {
...
@@ -546,8 +546,8 @@ public class SpringApplication {
}
}
private
Banner
selectBanner
(
Environment
environment
)
{
private
Banner
selectBanner
(
Environment
environment
)
{
String
location
=
environment
String
location
=
environment
.
getProperty
(
BANNER_LOCATION_PROPERTY
,
.
getProperty
(
BANNER_LOCATION_PROPERTY
,
BANNER_LOCATION_PROPERTY_VALUE
);
BANNER_LOCATION_PROPERTY_VALUE
);
ResourceLoader
resourceLoader
=
this
.
resourceLoader
!=
null
?
this
.
resourceLoader
ResourceLoader
resourceLoader
=
this
.
resourceLoader
!=
null
?
this
.
resourceLoader
:
new
DefaultResourceLoader
(
getClassLoader
());
:
new
DefaultResourceLoader
(
getClassLoader
());
Resource
resource
=
resourceLoader
.
getResource
(
location
);
Resource
resource
=
resourceLoader
.
getResource
(
location
);
...
...
spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View file @
5a7dece1
...
@@ -604,8 +604,6 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
...
@@ -604,8 +604,6 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
static
class
ConfigurationPropertySources
static
class
ConfigurationPropertySources
extends
EnumerablePropertySource
<
Collection
<
PropertySource
<?>>>
{
extends
EnumerablePropertySource
<
Collection
<
PropertySource
<?>>>
{
private
final
Collection
<
PropertySource
<?>>
sources
;
private
final
Collection
<
PropertySource
<?>>
sources
;
private
final
String
[]
names
;
private
final
String
[]
names
;
...
...
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