Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E2A3100EE for ; Wed, 12 Jun 2013 13:16:20 +0000 (UTC) Received: (qmail 59886 invoked by uid 500); 12 Jun 2013 13:16:18 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 58831 invoked by uid 500); 12 Jun 2013 13:16:17 -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 57911 invoked by uid 99); 12 Jun 2013 13:16:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jun 2013 13:16:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jun 2013 13:16:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D3A21238889B; Wed, 12 Jun 2013 13:15:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1492182 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java Date: Wed, 12 Jun 2013 13:15:53 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130612131553.D3A21238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Wed Jun 12 13:15:53 2013 New Revision: 1492182 URL: http://svn.apache.org/r1492182 Log: Making sure multiple calls to JAXRSServerFactoryBean.setProvider does not lose the providers registered earlier Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java?rev=1492182&r1=1492181&r2=1492182&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java Wed Jun 12 13:15:53 2013 @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.ResourceBundle; @@ -71,7 +72,7 @@ public class AbstractJAXRSFactoryBean ex protected List schemaLocations; protected JAXRSServiceFactoryBean serviceFactory; - protected List entityProviders; + protected List entityProviders = new LinkedList(); protected AbstractJAXRSFactoryBean(JAXRSServiceFactoryBean serviceFactory) { this.serviceFactory = serviceFactory; @@ -278,21 +279,21 @@ public class AbstractJAXRSFactoryBean ex } /** - * Sets custom JAX-RS providers. + * Add custom JAX-RS providers to the list of providers * * @param entityProviders the entityProviders */ public void setProviders(List providers) { - this.entityProviders = providers; + this.entityProviders.addAll(providers); } /** - * Sets a custom JAX-RS provider. + * Add custom JAX-RS provider to the list of providers * * @param provider the custom provider. */ public void setProvider(Object provider) { - setProviders(Collections.singletonList(provider)); + entityProviders.add(provider); } protected void checkResources(boolean server) {