mockito#2974: fixes mockito#2974

jfrantzius · Apr 16, 2023 · b31d7e7 · b31d7e7
1 parent e40026f
commit b31d7e7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...in/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java b/...in/java/org/mockito/internal/configuration/injection/filter/TypeBasedCandidateFilter.java
@@ -77,9 +77,14 @@ protected boolean isCompatibleTypes(Type typeToMock, Type mockType, Field inject
 
     private Stream<Type> getSuperTypes(Class<?> concreteMockClass) {
         Stream<Type> mockInterfaces = Arrays.stream(concreteMockClass.getGenericInterfaces());
-        Stream<Type> mockSuperTypes =
-                Stream.concat(mockInterfaces, Stream.of(concreteMockClass.getGenericSuperclass()));
-        return mockSuperTypes;
+        Type genericSuperclass = concreteMockClass.getGenericSuperclass();
+        // for java.lang.Object, genericSuperclass is null
+        if (genericSuperclass!=null) {
+            Stream<Type> mockSuperTypes = Stream.concat(mockInterfaces, Stream.of(genericSuperclass));
+            return mockSuperTypes;
+        } else {
+            return mockInterfaces;
+        }
     }
 
     private boolean recurseOnTypeArguments(