svn commit: r1425883 - /openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java

[rmannibucau]

Author: rmannibucau
Date: Wed Dec 26 11:54:00 2012
New Revision: 1425883

URL: http://svn.apache.org/viewvc?rev=1425883&view=rev
Log:
TOMEE-679 if providers were configured just use them and skip defaults

Modified:
    
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java

Modified: 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1425883&r1=1425882&r2=1425883&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 Wed Dec 26 11:54:00 2012
@@ -133,9 +133,10 @@ public class CxfRsHttpListener implement
         }
         if (providers == null) {
             providers = new ArrayList<Object>();
-            providers.addAll(defaultProviders());
             if (additionalProviders != null && !additionalProviders.isEmpty()) 
{
                 providers.addAll(providers(services, additionalProviders));
+            } else {
+                providers.addAll(defaultProviders());
             }
             factory.setProviders(providers);
         }