Merge branch '2.0.x'

dc02616b · Stephane Nicoll · 8d701e6d · 9c09af0b · dc02616b
Commit dc02616b authored Nov 01, 2018 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

SpringApplication.java ...main/java/org/springframework/boot/SpringApplication.java +1 -2

No files found.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -1322,8 +1322,7 @@ public class SpringApplication {
 	}

 	private static <E> Set<E> asUnmodifiableOrderedSet(Collection<E> elements) {
-		List<E> list = new ArrayList<>();
-		list.addAll(elements);
+		List<E> list = new ArrayList<>(elements);
 		list.sort(AnnotationAwareOrderComparator.INSTANCE);
 		return new LinkedHashSet<>(list);
 	}