File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed
spring-core/src/main/java/org/springframework/core Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2022 the original author or authors.
2
+ * Copyright 2002-2023 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -568,7 +568,7 @@ private boolean determineUnresolvableGenerics() {
568
568
try {
569
569
for (Type genericInterface : resolved .getGenericInterfaces ()) {
570
570
if (genericInterface instanceof Class ) {
571
- if (forClass ((Class <?>) genericInterface ).hasGenerics () ) {
571
+ if (((Class <?>) genericInterface ).getTypeParameters (). length > 0 ) {
572
572
return true ;
573
573
}
574
574
}
@@ -577,7 +577,10 @@ private boolean determineUnresolvableGenerics() {
577
577
catch (TypeNotPresentException ex ) {
578
578
// Ignore non-present types in generic signature
579
579
}
580
- return getSuperType ().hasUnresolvableGenerics ();
580
+ Class <?> superclass = resolved .getSuperclass ();
581
+ if (superclass != null && superclass != Object .class ) {
582
+ return getSuperType ().hasUnresolvableGenerics ();
583
+ }
581
584
}
582
585
return false ;
583
586
}
You can’t perform that action at this time.
0 commit comments