Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2017-10-02 20:07:38 +01:00
parent fd478be5c3 71c15cb65e
commit 4e87f8163e
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,22 +182,23 @@ public class FileSystemWatcher {
* @param remainingScans the number of remaining scans * @param remainingScans the number of remaining scans
*/ */
void stopAfter(int remainingScans) { void stopAfter(int remainingScans) {
Thread thread = null;
synchronized (this.monitor) { synchronized (this.monitor) {
Thread thread = this.watchThread; thread = this.watchThread;
if (thread != null) { if (thread != null) {
this.remainingScans.set(remainingScans); this.remainingScans.set(remainingScans);
if (remainingScans <= 0) { if (remainingScans <= 0) {
thread.interrupt(); thread.interrupt();
} }
if (Thread.currentThread() != thread) { }
try { this.watchThread = null;
thread.join(); }
} if (Thread.currentThread() != thread) {
catch (InterruptedException ex) { try {
Thread.currentThread().interrupt(); thread.join();
} }
} catch (InterruptedException ex) {
this.watchThread = null; Thread.currentThread().interrupt();
} }
} }
} }