You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/11/02 15:23:37 UTC
[cxf] branch master updated: [CXF-7545] Checking for TypeVariable,
patch from Evaristo Wychoski Benfatti applied, This closes #332
This is an automated email from the ASF dual-hosted git repository.
sergeyb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 9c16d1d [CXF-7545] Checking for TypeVariable, patch from Evaristo Wychoski Benfatti applied, This closes #332
9c16d1d is described below
commit 9c16d1daca67c80941bcf8d369350cec01d52c02
Author: Sergey Beryozkin <sb...@gmail.com>
AuthorDate: Thu Nov 2 15:23:13 2017 +0000
[CXF-7545] Checking for TypeVariable, patch from Evaristo Wychoski Benfatti applied, This closes #332
---
.../src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 9e1317f..7f4c7e7 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -29,6 +29,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
@@ -1074,7 +1075,8 @@ public class WadlGenerator implements ContainerRequestFilter {
} else {
theActualType = ResourceUtils.getActualJaxbType(type, opMethod, inbound);
}
- if (theActualType == Object.class && !(genericType instanceof Class)) {
+ if (theActualType == Object.class && !(genericType instanceof Class)
+ || genericType instanceof TypeVariable) {
Type theType = InjectionUtils.processGenericTypeIfNeeded(
ori.getClassResourceInfo().getServiceClass(), Object.class, genericType);
theActualType = InjectionUtils.getActualType(theType);
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].