cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6849] making sure the annotated method is preferred
Date Thu, 31 Mar 2016 16:52:54 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c95694abb -> 35c925510


[CXF-6849] making sure the annotated method is preferred


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

Branch: refs/heads/3.0.x-fixes
Commit: 35c9255101caae0dcb7392abbd1a8f6318ef448e
Parents: c95694a
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Mar 31 17:50:32 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Mar 31 17:52:39 2016 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/35c92551/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
index 4bbbea1..858d799 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
@@ -589,7 +589,7 @@ public final class ResourceUtils {
                                                boolean jaxbOnly,
                                                MessageBodyWriter<?> jaxbWriter) {
         for (OperationResourceInfo ori : resource.getMethodDispatcher().getOperationResourceInfos())
{
-            Method method = ori.getMethodToInvoke();
+            Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke() :
ori.getAnnotatedMethod();
             Class<?> realReturnType = method.getReturnType();
             Class<?> cls = realReturnType;
             if (cls == Response.class) {


Mime
View raw message