root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix broken locking in Restarter.initialize 

Closes gh-4955
This commit is contained in:
Andy Wilkinson 2016-01-22 15:21:00 +00:00
parent c77a7e0cba
commit 4c1bb38878
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
View File

@ -525,12 +525,16 @@ public class Restarter {
public static void initialize(String[] args, boolean forceReferenceCleanup,
RestartInitializer initializer, boolean restartOnInitialize,
RestartListener... listeners) {
if (instance == null) {
synchronized (Restarter.class) {
instance = new Restarter(Thread.currentThread(), args,
Restarter localInstance = null;
synchronized (Restarter.class) {
if (instance == null) {
localInstance = new Restarter(Thread.currentThread(), args,
forceReferenceCleanup, initializer, listeners);
instance = localInstance;
}
instance.initialize(restartOnInitialize);
}
if (localInstance != null) {
localInstance.initialize(restartOnInitialize);
}
}