Apply former changes by Jim on jettison provider to both deployment p…

…aths (with and without Application)
jbossws · Feb 17, 2016 · f00fd3a · f00fd3a
1 parent 47d3fe5
commit f00fd3a
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...ver/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JAXRSBusDeploymentAspect.java b/...ver/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JAXRSBusDeploymentAspect.java
@@ -103,6 +103,7 @@ private void startDeploymentBus(final Deployment dep)
                JAXRSServerFactoryBean bean = ResourceUtils.createApplication(providerApp.getProvider(), false, false);
                bean.setBus(bus);
                bean.setApplicationInfo(providerApp);
+               setJSONProviders(bean);
                bean.create();
             }
          } else {
@@ -138,12 +139,7 @@ private void startDeploymentBus(final Deployment dep)
                }
                bean.setProviders(providers);
             }
-            //Add default Jettison provider
-            @SuppressWarnings("rawtypes")
-			JSONProvider jsonProvider = new JSONProvider();
-            jsonProvider.setDropRootElement(true);
-            bean.setProvider(jsonProvider);
-            //TODO: Add jackson provider
+            setJSONProviders(bean);
             bean.create();
 
 
@@ -157,6 +153,15 @@ private void startDeploymentBus(final Deployment dep)
          SecurityActions.setContextClassLoader(origClassLoader);
       }
    }
+
+   private static void setJSONProviders(JAXRSServerFactoryBean bean) {
+      //Add default Jettison provider
+      @SuppressWarnings("rawtypes")
+      JSONProvider jsonProvider = new JSONProvider();
+      jsonProvider.setDropRootElement(true);
+      bean.setProvider(jsonProvider);
+      //TODO: Add jackson provider
+   }
 
    private Object createSingletonInstance(Class<?> cls, Bus bus)
    {