Fix object casting in ProxyViewHelper

Juraj Novák · Juraj Novák · commit 8e9d35c7dbdd · 2017-02-20T10:18:41.000+01:00
diff --git a/library/src/main/java/eu/inloop/viewmodel/ProxyViewHelper.java b/library/src/main/java/eu/inloop/viewmodel/ProxyViewHelper.java
@@ -34,9 +34,11 @@ public static Class<?> getGenericType(@NonNull Class<?> in, @NonNull Class<?> wh
         if (genericSuperclass instanceof ParameterizedType) {
             final Type[] typeArgs = ((ParameterizedType) genericSuperclass).getActualTypeArguments();
             for (Type arg : typeArgs) {
-                final Class<?> argClass = (Class<?>) arg;
-                if (whichExtends.isAssignableFrom(argClass)) {
-                    return argClass;
+                if (arg instanceof Class<?>) {
+                    final Class<?> argClass = (Class<?>) arg;
+                    if (whichExtends.isAssignableFrom(argClass)) {
+                        return argClass;
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,11 @@ public static Class<?> getGenericType(@NonNull Class<?> in, @NonNull Class<?> wh`
`34`	`34`	`if (genericSuperclass instanceof ParameterizedType) {`
`35`	`35`	`final Type[] typeArgs = ((ParameterizedType) genericSuperclass).getActualTypeArguments();`
`36`	`36`	`for (Type arg : typeArgs) {`
`37`		`- final Class<?> argClass = (Class<?>) arg;`
`38`		`- if (whichExtends.isAssignableFrom(argClass)) {`
`39`		`- return argClass;`
	`37`	`+ if (arg instanceof Class<?>) {`
	`38`	`+ final Class<?> argClass = (Class<?>) arg;`
	`39`	`+ if (whichExtends.isAssignableFrom(argClass)) {`
	`40`	`+ return argClass;`
	`41`	`+ }`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`	`}`