fixed files form Mockito #12

Spirals-Team · Mar 7, 2017 · f8831a8 · f8831a8
1 parent 8b855ea
commit f8831a8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/projects/Mockito/12/org/mockito/internal/util/reflection/GenericMaster.java b/projects/Mockito/12/org/mockito/internal/util/reflection/GenericMaster.java
@@ -17,8 +17,12 @@ public Class getGenericType(Field field) {
         Type generic = field.getGenericType();
         if (generic != null && generic instanceof ParameterizedType) {
             Type actual = ((ParameterizedType) generic).getActualTypeArguments()[0];
+            if (actual instanceof Class) {
                 return (Class) actual;
+            } else if (actual instanceof ParameterizedType) {
                 //in case of nested generics we don't go deep
+                return (Class) ((ParameterizedType) actual).getRawType();
+            }
         }
 
         return Object.class;