BZ-1326805 - Serialization problems on websphere as a result of BZ-12…

…99549 (#442)
kiegroup · Apr 20, 2016 · 224900c · 224900c
1 parent f787f6c
commit 224900c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/...e-remote-services/src/main/java/org/kie/remote/services/rest/jaxb/DynamicJaxbContext.java b/...e-remote-services/src/main/java/org/kie/remote/services/rest/jaxb/DynamicJaxbContext.java
@@ -125,6 +125,10 @@ public static void clearDeploymentJaxbContext() {
 
     // JAXBContext methods --------------------------------------------------------------------------------------------------------
 
+    JAXBContext getRequestContext() {
+        return requestJaxbContext.get();
+    }
+
     /*
      * (non-Javadoc)
      * @see javax.xml.bind.JAXBContext#createUnmarshaller()
@@ -167,8 +171,6 @@ public Validator createValidator() throws JAXBException {
 
     // Deployment jaxbContext management and creation logic -----------------------------------------------------------------------
 
-
-
     @Override
     public boolean equals( Object obj ) {
         if( obj instanceof DynamicJaxbContext ) {
@@ -177,5 +179,4 @@ public boolean equals( Object obj ) {
         return false;
     }
 
-
-}
+}
diff --git a/...e-services/src/main/java/org/kie/remote/services/rest/jaxb/DynamicJaxbContextManager.java b/...e-services/src/main/java/org/kie/remote/services/rest/jaxb/DynamicJaxbContextManager.java
@@ -39,6 +39,25 @@ public class DynamicJaxbContextManager {
 
     private static final Logger logger = LoggerFactory.getLogger(DynamicJaxbContextManager.class);
 
+
+    private final static boolean onWebsphere;
+    private final static String WEBSPHERE_JAXB_CACHING_CLASS_NAME
+        = "org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider";
+
+    static {
+        // websphere stuff
+        boolean classFound = false;
+        try {
+            Class.forName(WEBSPHERE_JAXB_CACHING_CLASS_NAME);
+            classFound = true;
+        } catch (ClassNotFoundException e) {
+            // no-op
+        }
+        onWebsphere = classFound;
+    }
+
+    // LOGGING IF MULTIPLE INSTANCES ARE CREATED ----------------------------------------------------------------------------------
+
     private static AtomicInteger instanceCreated = new AtomicInteger(0);
 
     public DynamicJaxbContextManager() {
@@ -204,6 +223,10 @@ private void removeClassFromJaxbContextClassList( List<Class> classList, Illegal
     }
 
     public JAXBContext getJaxbContext() {
-        return _jaxbContextInstance;
+        if (onWebsphere ) {
+            return _jaxbContextInstance.getRequestContext();
+        } else {
+            return _jaxbContextInstance;
+        }
     }
 }