DELTASPIKE-1160 allow native repository queries to return List or any…

… super type
apache · Jun 2, 2016 · 494d5cd · 494d5cd
1 parent 2b06c14
commit 494d5cd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...ata/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java b/...ata/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java
@@ -85,7 +85,7 @@ else if (query.isNative())
 
     private Class<?> getMethodResultEntityClass(Method m){
         Class<?> rt = m.getReturnType();
-        if(rt == List.class){
+        if(rt.isAssignableFrom(List.class) && rt != Object.class){
             ParameterizedType pt = (ParameterizedType) m.getGenericReturnType();
             return (Class<?>) pt.getActualTypeArguments()[0];
         }