Add missing null check in FileSystemWatcher.stopAfter()

Closes gh-10941

Add missing null check in FileSystemWatcher.stopAfter()
Closes gh-10941
b965171b · Johnny Lim · Stephane Nicoll · 373f7db3 · b965171b
Commit b965171b authored Nov 06, 2017 by Johnny Lim Committed by Stephane Nicoll Nov 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

FileSystemWatcher.java ...gframework/boot/devtools/filewatch/FileSystemWatcher.java +1 -1

No files found.
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
@@ -194,7 +194,7 @@ public class FileSystemWatcher {
 			}
 			this.watchThread = null;
 		}
-		if (Thread.currentThread() != thread) {
+		if (thread != null && Thread.currentThread() != thread) {
 			try {
 				thread.join();
 			}