Skip to content

Commit 3477738

Browse files
committed
Consistently pick lowest superclass level to replace
See gh-28676
1 parent fa5d246 commit 3477738

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ private void removeKnownSuperclass(String removedClass, boolean replace) {
478478
if (entry.getValue().isEmpty()) {
479479
it.remove();
480480
}
481-
else if (replace) {
481+
else if (replace && replacingClass == null) {
482482
replacedSuperclass = entry.getKey();
483483
replacingClass = entry.getValue().get(0);
484484
}

0 commit comments

Comments
 (0)