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/03/14 16:45:40 UTC

cxf git commit: [CXF-7279] Minor improvement

Repository: cxf
Updated Branches:
  refs/heads/master d0821bce5 -> 94060fc02


[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/94060fc0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/94060fc0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/94060fc0

Branch: refs/heads/master
Commit: 94060fc026b3b7214337c9fcfce71c06f0fb4444
Parents: d0821bc
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Mar 14 16:45:26 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Mar 14 16:45:26 2017 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java    | 2 +-
 .../org/apache/cxf/jaxrs/utils/ParameterizedCollectionType.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/94060fc0/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 0c4e8e3..1f278ae 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
@@ -1504,7 +1504,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/94060fc0/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 0c53fbf..dad33f5 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,6 +31,11 @@ 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;