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
708cbd72
Commit
708cbd72
authored
Feb 10, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ignore events from other contexts when waiting for DS init to complete
Fixes gh-24966
parent
1524793a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
DataSourceInitializedPublisher.java
...autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
+12
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DataSourceInitializedPublisher.java
View file @
708cbd72
...
@@ -36,6 +36,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
...
@@ -36,6 +36,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceSchemaCreatedEvent
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceSchemaCreatedEvent
;
import
org.springframework.boot.jdbc.EmbeddedDatabaseConnection
;
import
org.springframework.boot.jdbc.EmbeddedDatabaseConnection
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContextAware
;
import
org.springframework.context.ApplicationListener
;
import
org.springframework.context.ApplicationListener
;
import
org.springframework.context.annotation.ImportBeanDefinitionRegistrar
;
import
org.springframework.context.annotation.ImportBeanDefinitionRegistrar
;
import
org.springframework.context.event.ContextRefreshedEvent
;
import
org.springframework.context.event.ContextRefreshedEvent
;
...
@@ -136,12 +137,17 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
...
@@ -136,12 +137,17 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
* blocks until any asynchronous DataSource initialization has completed.
* blocks until any asynchronous DataSource initialization has completed.
*/
*/
static
class
DataSourceInitializationCompletionListener
static
class
DataSourceInitializationCompletionListener
implements
ApplicationListener
<
ContextRefreshedEvent
>,
Ordered
{
implements
ApplicationListener
<
ContextRefreshedEvent
>,
Ordered
,
ApplicationContextAware
{
private
volatile
ApplicationContext
applicationContext
;
private
volatile
Future
<?>
dataSourceInitialization
;
private
volatile
Future
<?>
dataSourceInitialization
;
@Override
@Override
public
void
onApplicationEvent
(
ContextRefreshedEvent
event
)
{
public
void
onApplicationEvent
(
ContextRefreshedEvent
event
)
{
if
(!
event
.
getApplicationContext
().
equals
(
this
.
applicationContext
))
{
return
;
}
Future
<?>
dataSourceInitialization
=
this
.
dataSourceInitialization
;
Future
<?>
dataSourceInitialization
=
this
.
dataSourceInitialization
;
if
(
dataSourceInitialization
!=
null
)
{
if
(
dataSourceInitialization
!=
null
)
{
try
{
try
{
...
@@ -158,6 +164,11 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
...
@@ -158,6 +164,11 @@ class DataSourceInitializedPublisher implements BeanPostProcessor {
return
Ordered
.
HIGHEST_PRECEDENCE
;
return
Ordered
.
HIGHEST_PRECEDENCE
;
}
}
@Override
public
void
setApplicationContext
(
ApplicationContext
applicationContext
)
{
this
.
applicationContext
=
applicationContext
;
}
}
}
/**
/**
...
...
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