Skip to content

Commit f975e8d

Browse files
committed
Merge pull request #10941 from izeye:null-check
* pr/10941: Add missing null check in FileSystemWatcher.stopAfter()
2 parents 373f7db + b965171 commit f975e8d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void stopAfter(int remainingScans) {
194194
}
195195
this.watchThread = null;
196196
}
197-
if (Thread.currentThread() != thread) {
197+
if (thread != null && Thread.currentThread() != thread) {
198198
try {
199199
thread.join();
200200
}

0 commit comments

Comments
 (0)