Fix broken locking in Restarter.initialize

Closes spring-projectsgh-4955
yigit-darcin · Jan 22, 2016 · 4c1bb38 · 4c1bb38
1 parent c77a7e0
commit 4c1bb38
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
@@ -525,12 +525,16 @@ public static void initialize(String[] args, boolean forceReferenceCleanup,
 	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);
 		}
 	}