From 373f7db3b53cd1dda32039bc7d8ae2357844f96d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 7 Nov 2017 08:44:40 +0100 Subject: [PATCH 1/2] Add missing supported source version Closes gh-10929 --- .../AutoConfigureAnnotationProcessor.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java index fe09512e66..87f650496e 100644 --- a/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java +++ b/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java @@ -29,6 +29,7 @@ import java.util.Set; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -80,6 +81,11 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor { "org.springframework.boot.autoconfigure.AutoConfigureOrder"); } + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latestSupported(); + } + @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { From b965171b41e0abdb07ca562eb383a533f25fceb4 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 7 Nov 2017 02:22:50 +0900 Subject: [PATCH 2/2] Add missing null check in FileSystemWatcher.stopAfter() Closes gh-10941 --- .../boot/devtools/filewatch/FileSystemWatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index c3530b3b7f..9c44a4e0d3 100644 --- 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(); }