root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '5.2.x'

This commit is contained in:
Sam Brannen 2020-08-03 13:44:39 +02:00
parent d646e602d9 91d1383e93
commit c17f2047f6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/core/annotation/TypeMappedAnnotations.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -211,7 +211,7 @@ final class TypeMappedAnnotations implements MergedAnnotations {
@Override @Override
public Spliterator<MergedAnnotation<Annotation>> spliterator() { public Spliterator<MergedAnnotation<Annotation>> spliterator() {
if (this.annotationFilter == AnnotationFilter.ALL) { if (this.annotationFilter == AnnotationFilter.ALL) {
return Collections.<MergedAnnotation<Annotation>> emptyList().spliterator(); return Spliterators.emptySpliterator();
} }
return spliterator(null); return spliterator(null);
} }