Merge branch '2.0.x'
This commit is contained in:
		
						commit
						dc02616b78
					
				| 
						 | 
				
			
			@ -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);
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue