Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
This commit is contained in:
Sam Brannen
2022-09-14 16:52:55 +02:00
parent 992a81ab68 62a0ab3667
commit 8d92c57777
17 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java
View File

@@ -80,7 +80,7 @@ class TypeHelper {
}
/**
* Return the super class of the specified {@link Element} or null if this
* Return the superclass of the specified {@link Element} or null if this
* {@code element} represents {@link Object}.
*/
public Element getSuperClass(Element element) {
@@ -99,7 +99,7 @@ class TypeHelper {
public List<Element> getDirectInterfaces(Element element) {
List<? extends TypeMirror> superTypes = this.types.directSupertypes(element.asType());
List<Element> directInterfaces = new ArrayList<>();
if (superTypes.size() > 1) { // index 0 is the super class
if (superTypes.size() > 1) { // index 0 is the superclass
for (int i = 1; i < superTypes.size(); i++) {
Element e = this.types.asElement(superTypes.get(i));
if (e != null) {