Merge pull request #10941 from izeye:null-check

* pr/10941:
  Add missing null check in FileSystemWatcher.stopAfter()
pull/10987/head
Stephane Nicoll 7 years ago
commit f975e8d363

@ -194,7 +194,7 @@ public class FileSystemWatcher {
}
this.watchThread = null;
}
if (Thread.currentThread() != thread) {
if (thread != null && Thread.currentThread() != thread) {
try {
thread.join();
}

Loading…
Cancel
Save