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
f86831da
Commit
f86831da
authored
Jun 30, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use TCCL at time of access for resource loading
Fixes gh-22119
parent
f19f2b87
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
11 deletions
+7
-11
DataSourceInitializer.java
...mework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+1
-2
MustacheResourceTemplateLoader.java
...utoconfigure/mustache/MustacheResourceTemplateLoader.java
+1
-1
ClassLoaderFilesResourcePatternResolver.java
...ools/restart/ClassLoaderFilesResourcePatternResolver.java
+1
-2
SpringBootContextLoader.java
...gframework/boot/test/context/SpringBootContextLoader.java
+1
-1
SpringApplication.java
...main/java/org/springframework/boot/SpringApplication.java
+1
-1
ConfigFileApplicationListener.java
...rk/boot/context/config/ConfigFileApplicationListener.java
+1
-2
StringToFileConverter.java
...g/springframework/boot/convert/StringToFileConverter.java
+1
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
View file @
f86831da
...
@@ -67,8 +67,7 @@ class DataSourceInitializer {
...
@@ -67,8 +67,7 @@ class DataSourceInitializer {
DataSourceInitializer
(
DataSource
dataSource
,
DataSourceProperties
properties
,
ResourceLoader
resourceLoader
)
{
DataSourceInitializer
(
DataSource
dataSource
,
DataSourceProperties
properties
,
ResourceLoader
resourceLoader
)
{
this
.
dataSource
=
dataSource
;
this
.
dataSource
=
dataSource
;
this
.
properties
=
properties
;
this
.
properties
=
properties
;
this
.
resourceLoader
=
(
resourceLoader
!=
null
)
?
resourceLoader
this
.
resourceLoader
=
(
resourceLoader
!=
null
)
?
resourceLoader
:
new
DefaultResourceLoader
(
null
);
:
new
DefaultResourceLoader
(
getClass
().
getClassLoader
());
}
}
/**
/**
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheResourceTemplateLoader.java
View file @
f86831da
...
@@ -47,7 +47,7 @@ public class MustacheResourceTemplateLoader implements TemplateLoader, ResourceL
...
@@ -47,7 +47,7 @@ public class MustacheResourceTemplateLoader implements TemplateLoader, ResourceL
private
String
charSet
=
"UTF-8"
;
private
String
charSet
=
"UTF-8"
;
private
ResourceLoader
resourceLoader
=
new
DefaultResourceLoader
(
getClass
().
getClassLoader
()
);
private
ResourceLoader
resourceLoader
=
new
DefaultResourceLoader
(
null
);
public
MustacheResourceTemplateLoader
()
{
public
MustacheResourceTemplateLoader
()
{
}
}
...
...
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java
View file @
f86831da
...
@@ -238,8 +238,7 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
...
@@ -238,8 +238,7 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
private
final
Supplier
<
Collection
<
ProtocolResolver
>>
protocolResolvers
;
private
final
Supplier
<
Collection
<
ProtocolResolver
>>
protocolResolvers
;
ApplicationContextResourceLoader
(
Supplier
<
Collection
<
ProtocolResolver
>>
protocolResolvers
)
{
ApplicationContextResourceLoader
(
Supplier
<
Collection
<
ProtocolResolver
>>
protocolResolvers
)
{
// Use the restart class loader
super
(
null
);
super
(
Thread
.
currentThread
().
getContextClassLoader
());
this
.
protocolResolvers
=
protocolResolvers
;
this
.
protocolResolvers
=
protocolResolvers
;
}
}
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
View file @
f86831da
...
@@ -95,7 +95,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
...
@@ -95,7 +95,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
setActiveProfiles
(
environment
,
config
.
getActiveProfiles
());
setActiveProfiles
(
environment
,
config
.
getActiveProfiles
());
}
}
ResourceLoader
resourceLoader
=
(
application
.
getResourceLoader
()
!=
null
)
?
application
.
getResourceLoader
()
ResourceLoader
resourceLoader
=
(
application
.
getResourceLoader
()
!=
null
)
?
application
.
getResourceLoader
()
:
new
DefaultResourceLoader
(
getClass
().
getClassLoader
()
);
:
new
DefaultResourceLoader
(
null
);
TestPropertySourceUtils
.
addPropertiesFilesToEnvironment
(
environment
,
resourceLoader
,
TestPropertySourceUtils
.
addPropertiesFilesToEnvironment
(
environment
,
resourceLoader
,
config
.
getPropertySourceLocations
());
config
.
getPropertySourceLocations
());
TestPropertySourceUtils
.
addInlinedPropertiesToEnvironment
(
environment
,
getInlinedProperties
(
config
));
TestPropertySourceUtils
.
addInlinedPropertiesToEnvironment
(
environment
,
getInlinedProperties
(
config
));
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @
f86831da
...
@@ -550,7 +550,7 @@ public class SpringApplication {
...
@@ -550,7 +550,7 @@ public class SpringApplication {
return
null
;
return
null
;
}
}
ResourceLoader
resourceLoader
=
(
this
.
resourceLoader
!=
null
)
?
this
.
resourceLoader
ResourceLoader
resourceLoader
=
(
this
.
resourceLoader
!=
null
)
?
this
.
resourceLoader
:
new
DefaultResourceLoader
(
getClassLoader
()
);
:
new
DefaultResourceLoader
(
null
);
SpringApplicationBannerPrinter
bannerPrinter
=
new
SpringApplicationBannerPrinter
(
resourceLoader
,
this
.
banner
);
SpringApplicationBannerPrinter
bannerPrinter
=
new
SpringApplicationBannerPrinter
(
resourceLoader
,
this
.
banner
);
if
(
this
.
bannerMode
==
Mode
.
LOG
)
{
if
(
this
.
bannerMode
==
Mode
.
LOG
)
{
return
bannerPrinter
.
print
(
environment
,
this
.
mainApplicationClass
,
logger
);
return
bannerPrinter
.
print
(
environment
,
this
.
mainApplicationClass
,
logger
);
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
View file @
f86831da
...
@@ -326,8 +326,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
...
@@ -326,8 +326,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
Loader
(
ConfigurableEnvironment
environment
,
ResourceLoader
resourceLoader
)
{
Loader
(
ConfigurableEnvironment
environment
,
ResourceLoader
resourceLoader
)
{
this
.
environment
=
environment
;
this
.
environment
=
environment
;
this
.
placeholdersResolver
=
new
PropertySourcesPlaceholdersResolver
(
this
.
environment
);
this
.
placeholdersResolver
=
new
PropertySourcesPlaceholdersResolver
(
this
.
environment
);
this
.
resourceLoader
=
(
resourceLoader
!=
null
)
?
resourceLoader
this
.
resourceLoader
=
(
resourceLoader
!=
null
)
?
resourceLoader
:
new
DefaultResourceLoader
(
null
);
:
new
DefaultResourceLoader
(
getClass
().
getClassLoader
());
this
.
propertySourceLoaders
=
SpringFactoriesLoader
.
loadFactories
(
PropertySourceLoader
.
class
,
this
.
propertySourceLoaders
=
SpringFactoriesLoader
.
loadFactories
(
PropertySourceLoader
.
class
,
getClass
().
getClassLoader
());
getClass
().
getClassLoader
());
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/StringToFileConverter.java
View file @
f86831da
...
@@ -33,8 +33,7 @@ import org.springframework.util.ResourceUtils;
...
@@ -33,8 +33,7 @@ import org.springframework.util.ResourceUtils;
*/
*/
class
StringToFileConverter
implements
Converter
<
String
,
File
>
{
class
StringToFileConverter
implements
Converter
<
String
,
File
>
{
private
static
final
ResourceLoader
resourceLoader
=
new
DefaultResourceLoader
(
private
static
final
ResourceLoader
resourceLoader
=
new
DefaultResourceLoader
(
null
);
StringToFileConverter
.
class
.
getClassLoader
());
@Override
@Override
public
File
convert
(
String
source
)
{
public
File
convert
(
String
source
)
{
...
...
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