Merge pull request #10941 from izeye:null-check

* pr/10941: Add missing null check in FileSystemWatcher.stopAfter()
2017-11-07 08:45:45 +01:00
parent 373f7db3b5 b965171b41
commit f975e8d363
1 changed files with 1 additions and 1 deletions
--- 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();
 			}