Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2A001200C08 for ; Thu, 26 Jan 2017 17:41:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 28928160B4C; Thu, 26 Jan 2017 16:41:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 737E5160B31 for ; Thu, 26 Jan 2017 17:41:52 +0100 (CET) Received: (qmail 49888 invoked by uid 500); 26 Jan 2017 16:41:51 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 49879 invoked by uid 99); 26 Jan 2017 16:41:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2017 16:41:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58828DFB0E; Thu, 26 Jan 2017 16:41:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7228] Using ClassHelper to get the real provider info class in some cases Date: Thu, 26 Jan 2017 16:41:51 +0000 (UTC) archived-at: Thu, 26 Jan 2017 16:41:53 -0000 Repository: cxf Updated Branches: refs/heads/master f8439a921 -> bf5dee134 [CXF-7228] Using ClassHelper to get the real provider info class in some cases Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bf5dee13 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf5dee13 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf5dee13 Branch: refs/heads/master Commit: bf5dee1340b680f92f02d63d4801ed40af540dc5 Parents: f8439a9 Author: Sergey Beryozkin Authored: Thu Jan 26 16:41:31 2017 +0000 Committer: Sergey Beryozkin Committed: Thu Jan 26 16:41:31 2017 +0000 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/provider/ProviderFactory.java | 3 ++- .../cxf/jaxrs/provider/ServerProviderFactory.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bf5dee13/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java index fd850de..a038f84 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java @@ -1224,7 +1224,8 @@ public abstract class ProviderFactory { names = ((FilterProviderInfo)p).getNameBinding(); } if (names == null) { - names = AnnotationUtils.getNameBindings(p.getProvider().getClass().getAnnotations()); + Class pClass = ClassHelper.getRealClass(p.getBus(), p.getProvider()); + names = AnnotationUtils.getNameBindings(pClass.getAnnotations()); } if (names.isEmpty()) { names = Collections.singleton(DEFAULT_FILTER_NAME_BINDING); http://git-wip-us.apache.org/repos/asf/cxf/blob/bf5dee13/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java index 13cae5a..9c8ef9f 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java @@ -563,8 +563,9 @@ public final class ServerProviderFactory extends ProviderFactory { } private boolean isRegistered(Collection list, Class cls) { Collection> list2 = CastUtils.cast(list); - for (ProviderInfo pi : list2) { - if (cls.isAssignableFrom(pi.getProvider().getClass())) { + for (ProviderInfo p : list2) { + Class pClass = ClassHelper.getRealClass(p.getBus(), p.getProvider()); + if (cls.isAssignableFrom(pClass)) { return true; } } @@ -572,9 +573,12 @@ public final class ServerProviderFactory extends ProviderFactory { } private Integer getPriority(Collection list, Class cls, Class filterClass) { Collection> list2 = CastUtils.cast(list); - for (ProviderInfo pi : list2) { - if (pi instanceof FilterProviderInfo && pi.getProvider().getClass().isAssignableFrom(cls)) { - return ((FilterProviderInfo)pi).getPriority(filterClass); + for (ProviderInfo p : list2) { + if (p instanceof FilterProviderInfo) { + Class pClass = ClassHelper.getRealClass(p.getBus(), p.getProvider()); + if (cls.isAssignableFrom(pClass)) { + return ((FilterProviderInfo)p).getPriority(filterClass); + } } } return Priorities.USER;