Commit f975e8d3 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #10941 from izeye:null-check

* pr/10941:
  Add missing null check in FileSystemWatcher.stopAfter()
parents 373f7db3 b965171b
...@@ -194,7 +194,7 @@ public class FileSystemWatcher { ...@@ -194,7 +194,7 @@ public class FileSystemWatcher {
} }
this.watchThread = null; this.watchThread = null;
} }
if (Thread.currentThread() != thread) { if (thread != null && Thread.currentThread() != thread) {
try { try {
thread.join(); thread.join();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment