You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/26 19:53:03 UTC

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

Author: rmannibucau
Date: Tue Aug 26 17:53:03 2014
New Revision: 1620680

URL: http://svn.apache.org/r1620680
Log:
default cxf providers doesnt leak

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=1620680&r1=1620679&r2=1620680&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:53:03 2014
@@ -352,14 +352,15 @@ public class CxfRsHttpListener implement
         instances.add(new WadlDocumentMessageBodyWriter());
         instances.add(EJBAccessExceptionMapper.INSTANCE);
 
-        // CXF defaults: cause we need to handle it here as much as possible to try to not leak
-        instances.add(new WebApplicationExceptionMapper());
-        instances.add(new BinaryDataProvider<>());
-        instances.add(new SourceProvider<>());
-        instances.add(new DataSourceProvider<>());
-        instances.add(new FormEncodingProvider<>());
-        instances.add(new PrimitiveTextProvider<>());
-        instances.add(new MultipartProvider());
+        if ("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.jaxrs.cxf.add-cxf-providers", "false")) {
+            instances.add(new WebApplicationExceptionMapper());
+            instances.add(new BinaryDataProvider<>());
+            instances.add(new SourceProvider<>());
+            instances.add(new DataSourceProvider<>());
+            instances.add(new FormEncodingProvider<>());
+            instances.add(new PrimitiveTextProvider<>());
+            instances.add(new MultipartProvider());
+        }
     }
 
     private Object newProvider(final Class<?> clazz) throws IllegalAccessException, InstantiationException {