6847 WLS JMS connector doesn't support named factory bean (#6922)

helidon-io · Jun 28, 2023 · 4cf5bb2 · 4cf5bb2
1 parent dff9b10
commit 4cf5bb2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...g/connectors/jms/src/main/java/io/helidon/messaging/connectors/jms/ConnectionContext.java b/...g/connectors/jms/src/main/java/io/helidon/messaging/connectors/jms/ConnectionContext.java
@@ -37,6 +37,7 @@
 import static io.helidon.messaging.connectors.jms.JmsConnector.JNDI_JMS_FACTORY_ATTRIBUTE;
 import static io.helidon.messaging.connectors.jms.JmsConnector.JNDI_JMS_FACTORY_DEFAULT;
 import static io.helidon.messaging.connectors.jms.JmsConnector.JNDI_PROPS_ATTRIBUTE;
+import static io.helidon.messaging.connectors.jms.JmsConnector.NAMED_FACTORY_ATTRIBUTE;
 
 /**
  * Context related to one actual connection being constructed by JMS connector.
@@ -69,7 +70,8 @@ public class ConnectionContext {
     }
 
     boolean isJndi() {
-        return config.get(JNDI_ATTRIBUTE).exists();
+        return config.get(JNDI_ATTRIBUTE).exists()
+                && !config.get(NAMED_FACTORY_ATTRIBUTE).exists();
     }
 
     Optional<? extends ConnectionFactory> lookupFactory() {

diff --git a/...tors/wls-jms/src/main/java/io/helidon/messaging/connectors/wls/ThinClientClassLoader.java b/...tors/wls-jms/src/main/java/io/helidon/messaging/connectors/wls/ThinClientClassLoader.java
@@ -97,12 +97,14 @@ static <T> T executeInIsolation(IsolationSupplier<T> supplier) {
 
     boolean inWlsJar(String name) {
         // Load jms exceptions from inside the thin jar to avoid deserialization issues
-        if (name.startsWith("javax.jms") && name.endsWith("Exception")) {
+        if ((name.startsWith("javax.jms") || name.startsWith("jakarta.jms"))
+                && name.endsWith("Exception")) {
             return true;
         }
 
-        // Load only javax JMS API from outside, so cast works
+        // Load only javax and jakarta JMS API from outside, so cast works
         return !name.startsWith("javax.jms")
+                && !name.startsWith("jakarta.jms")
                 && !name.equals(IsolatedContextFactory.class.getName());
     }
 

diff --git a/messaging/connectors/wls-jms/src/main/resources/META-INF/helidon/serial-config.properties b/messaging/connectors/wls-jms/src/main/resources/META-INF/helidon/serial-config.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-pattern=weblogic.**;java.util.**;java.lang.**;java.io.**;java.rmi.**
+pattern=weblogic.**;java.util.**;java.lang.**;java.io.**;java.rmi.**;javax.naming.**