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
cf88508e
Commit
cf88508e
authored
May 12, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid exposing `spring.resources.favicon-locations` as a property
Closes gh-9214
parent
d7ba7ecc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ResourceProperties.java
...gframework/boot/autoconfigure/web/ResourceProperties.java
+1
-1
WebMvcAutoConfiguration.java
...ot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
+1
-1
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View file @
cf88508e
...
@@ -117,7 +117,7 @@ public class ResourceProperties implements ResourceLoaderAware {
...
@@ -117,7 +117,7 @@ public class ResourceProperties implements ResourceLoaderAware {
return
result
;
return
result
;
}
}
public
List
<
Resource
>
get
FaviconLocations
()
{
public
List
<
Resource
>
resolve
FaviconLocations
()
{
List
<
Resource
>
locations
=
new
ArrayList
<>(
this
.
staticLocations
.
length
+
1
);
List
<
Resource
>
locations
=
new
ArrayList
<>(
this
.
staticLocations
.
length
+
1
);
if
(
this
.
resourceLoader
!=
null
)
{
if
(
this
.
resourceLoader
!=
null
)
{
for
(
String
location
:
this
.
staticLocations
)
{
for
(
String
location
:
this
.
staticLocations
)
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
View file @
cf88508e
...
@@ -351,7 +351,7 @@ public class WebMvcAutoConfiguration {
...
@@ -351,7 +351,7 @@ public class WebMvcAutoConfiguration {
public
ResourceHttpRequestHandler
faviconRequestHandler
()
{
public
ResourceHttpRequestHandler
faviconRequestHandler
()
{
ResourceHttpRequestHandler
requestHandler
=
new
ResourceHttpRequestHandler
();
ResourceHttpRequestHandler
requestHandler
=
new
ResourceHttpRequestHandler
();
requestHandler
requestHandler
.
setLocations
(
this
.
resourceProperties
.
get
FaviconLocations
());
.
setLocations
(
this
.
resourceProperties
.
resolve
FaviconLocations
());
return
requestHandler
;
return
requestHandler
;
}
}
...
...
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