Skip to content

S
spring-boot
Commit dc02616b authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.0.x'

parents 8d701e6d 9c09af0b
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View file @ dc02616b
...@@ -1322,8 +1322,7 @@ public class SpringApplication { ...@@ -1322,8 +1322,7 @@ public class SpringApplication {
} }
private static <E> Set<E> asUnmodifiableOrderedSet(Collection<E> elements) { private static <E> Set<E> asUnmodifiableOrderedSet(Collection<E> elements) {
List<E> list = new ArrayList<>(); List<E> list = new ArrayList<>(elements);
list.addAll(elements);
list.sort(AnnotationAwareOrderComparator.INSTANCE); list.sort(AnnotationAwareOrderComparator.INSTANCE);
return new LinkedHashSet<>(list); return new LinkedHashSet<>(list);
} }
......
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