Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 4e2cf99e1 -> 2cfc8d8a6


[CXF-7279] Minor improvement


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2cfc8d8a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2cfc8d8a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2cfc8d8a

Branch: refs/heads/3.1.x-fixes
Commit: 2cfc8d8a6eefe81603e77a8a9e4b862f8c08546c
Parents: 4e2cf99
Author: Sergey Beryozkin <[email protected]>
Authored: Tue Mar 14 16:45:26 2017 +0000
Committer: Sergey Beryozkin <[email protected]>
Committed: Tue Mar 14 16:47:25 2017 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java  | 2 +-
 .../apache/cxf/jaxrs/utils/ParameterizedCollectionType.java   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2cfc8d8a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
----------------------------------------------------------------------
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 2f63997..3e9252a 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -1455,7 +1455,7 @@ public final class InjectionUtils {
                     type = new ParameterizedCollectionType((Class<?>)theType);
                 } else {
                     type = processGenericTypeIfNeeded(serviceCls, paramCls, 
theType);
-                    type = new ParameterizedCollectionType(getRawType(type));
+                    type = new ParameterizedCollectionType(type);
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/2cfc8d8a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ParameterizedCollectionType.java
----------------------------------------------------------------------
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ParameterizedCollectionType.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ParameterizedCollectionType.java
index 325864d..e119923 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ParameterizedCollectionType.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ParameterizedCollectionType.java
@@ -31,7 +31,12 @@ public final class ParameterizedCollectionType implements 
ParameterizedType {
         this.collectionMemberClass = collectionMemberClass;
         this.typeArgs = new Type[] {collectionMemberClass};
     }
-     
+
+    public ParameterizedCollectionType(Type pt) {
+        this.collectionMemberClass = InjectionUtils.getRawType(pt);
+        this.typeArgs = new Type[] {pt};
+    }
+
     public Type[] getActualTypeArguments() {
         return typeArgs;
     }

Reply via email to