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

[rmannibucau]

Author: rmannibucau
Date: Tue Aug 26 17:46:39 2014
New Revision: 1620677

URL: http://svn.apache.org/r1620677
Log:
TOMEE-1336 support to deactivate provider auto discovered when known

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

Modified: 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1620677&r1=1620676&r2=1620677&view=diff
==============================================================================
--- 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 (original)
+++ 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 Tue Aug 26 17:46:39 2014
@@ -307,6 +307,9 @@ public class CxfRsHttpListener implement
         for (final Object o : additionalProviders) {
             if (o instanceof Class<?>) {
                 final Class<?> clazz = (Class<?>) o;
+                if 
("false".equalsIgnoreCase(SystemInstance.get().getProperty(clazz.getName() + 
".activated", "true"))) {
+                    continue;
+                }
 
                 if (bm != null && bm.isInUse()) {
                     try {
@@ -334,6 +337,9 @@ public class CxfRsHttpListener implement
                     }
                 }
             } else {
+                if 
("false".equalsIgnoreCase(SystemInstance.get().getProperty(o.getClass().getName()
 + ".activated", "true"))) {
+                    continue;
+                }
                 instances.add(o);
             }
         }
@@ -685,7 +691,7 @@ public class CxfRsHttpListener implement
         jaxbProperties.put(Marshaller.JAXB_FRAGMENT, true);
         jaxb.setMarshallerProperties(jaxbProperties);
 
-        final List<Object> providers = new ArrayList<>(4);
+        final List<Object> providers = new ArrayList<>(2);
         providers.add(new FleeceProvider<>());
         providers.add(jaxb);
         return providers;