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 9BE1F200B5C for ; Thu, 30 Jun 2016 00:44:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9AA14160A79; Wed, 29 Jun 2016 22:44:02 +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 9AF06160A7A for ; Thu, 30 Jun 2016 00:44:01 +0200 (CEST) Received: (qmail 26183 invoked by uid 500); 29 Jun 2016 22:44:00 -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 24874 invoked by uid 99); 29 Jun 2016 22:43:59 -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; Wed, 29 Jun 2016 22:43:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5ECCCE963C; Wed, 29 Jun 2016 22:43:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reta@apache.org To: commits@cxf.apache.org Date: Wed, 29 Jun 2016 22:44:19 -0000 Message-Id: <9507001e4b7a4421b2437078b0ae59e9@git.apache.org> In-Reply-To: <4bcfaade3ee3407db49b6439dc67ac16@git.apache.org> References: <4bcfaade3ee3407db49b6439dc67ac16@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/48] cxf git commit: [CXF-6938] Removing the redundant bus property archived-at: Wed, 29 Jun 2016 22:44:02 -0000 [CXF-6938] Removing the redundant bus property Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/74f0cad5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/74f0cad5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/74f0cad5 Branch: refs/heads/master-jaxrs-2.1 Commit: 74f0cad5d1a8dcbcc60eb46018bbdfbd0cb9b06a Parents: 703e40b Author: Sergey Beryozkin Authored: Tue Jun 21 11:08:46 2016 +0100 Committer: Sergey Beryozkin Committed: Tue Jun 21 11:08:46 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/provider/ProviderFactory.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/74f0cad5/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 41f7346..4ee799c 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 @@ -520,16 +520,12 @@ public abstract class ProviderFactory { protected void setBusProviders() { List extensions = new LinkedList(); - final String alreadySetProp = "bus.providers.set." + this.hashCode(); - if (bus.getProperty(alreadySetProp) == null) { - addBusExtension(extensions, - MessageBodyReader.class, - MessageBodyWriter.class, - ExceptionMapper.class); - if (!extensions.isEmpty()) { - setProviders(true, true, extensions.toArray()); - bus.setProperty(alreadySetProp, ""); - } + addBusExtension(extensions, + MessageBodyReader.class, + MessageBodyWriter.class, + ExceptionMapper.class); + if (!extensions.isEmpty()) { + setProviders(true, true, extensions.toArray()); } }