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
468db03a
Commit
468db03a
authored
Sep 20, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting
parent
d6165d97
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
OnWebApplicationCondition.java
...ot/autoconfigure/condition/OnWebApplicationCondition.java
+1
-2
PropertySourcesPropertyValues.java
...ingframework/boot/bind/PropertySourcesPropertyValues.java
+3
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java
View file @
468db03a
...
@@ -75,8 +75,7 @@ class OnWebApplicationCondition extends SpringBootCondition {
...
@@ -75,8 +75,7 @@ class OnWebApplicationCondition extends SpringBootCondition {
}
}
if
(
context
.
getResourceLoader
()
instanceof
WebApplicationContext
)
{
if
(
context
.
getResourceLoader
()
instanceof
WebApplicationContext
)
{
return
ConditionOutcome
return
ConditionOutcome
.
match
(
"found web application WebApplicationContext"
);
.
match
(
"found web application WebApplicationContext"
);
}
}
return
ConditionOutcome
.
noMatch
(
"not a web application"
);
return
ConditionOutcome
.
noMatch
(
"not a web application"
);
...
...
spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
View file @
468db03a
...
@@ -51,7 +51,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
...
@@ -51,7 +51,7 @@ public class PropertySourcesPropertyValues implements PropertyValues {
private
static
final
Collection
<
String
>
NON_ENUMERABLE_ENUMERABLES
=
Arrays
.
asList
(
private
static
final
Collection
<
String
>
NON_ENUMERABLE_ENUMERABLES
=
Arrays
.
asList
(
StandardEnvironment
.
SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME
,
StandardEnvironment
.
SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME
,
StandardEnvironment
.
SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME
);
StandardEnvironment
.
SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME
);
/**
/**
* Create a new PropertyValues from the given PropertySources
* Create a new PropertyValues from the given PropertySources
* @param propertySources a PropertySources instance
* @param propertySources a PropertySources instance
...
@@ -107,7 +107,8 @@ public class PropertySourcesPropertyValues implements PropertyValues {
...
@@ -107,7 +107,8 @@ public class PropertySourcesPropertyValues implements PropertyValues {
PropertySourcesPropertyResolver
resolver
,
String
[]
includes
,
String
[]
exacts
)
{
PropertySourcesPropertyResolver
resolver
,
String
[]
includes
,
String
[]
exacts
)
{
if
(
source
.
getPropertyNames
().
length
>
0
)
{
if
(
source
.
getPropertyNames
().
length
>
0
)
{
for
(
String
propertyName
:
source
.
getPropertyNames
())
{
for
(
String
propertyName
:
source
.
getPropertyNames
())
{
if
(
PropertySourcesPropertyValues
.
NON_ENUMERABLE_ENUMERABLES
.
contains
(
source
.
getName
())
if
(
PropertySourcesPropertyValues
.
NON_ENUMERABLE_ENUMERABLES
.
contains
(
source
.
getName
())
&&
!
PatternMatchUtils
.
simpleMatch
(
includes
,
propertyName
))
{
&&
!
PatternMatchUtils
.
simpleMatch
(
includes
,
propertyName
))
{
continue
;
continue
;
}
}
...
...
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