File tree 3 files changed +8
-4
lines changed
jms/src/main/java/io/helidon/messaging/connectors/jms
java/io/helidon/messaging/connectors/wls
resources/META-INF/helidon
3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change 36
36
import static io .helidon .messaging .connectors .jms .JmsConnector .JNDI_JMS_FACTORY_ATTRIBUTE ;
37
37
import static io .helidon .messaging .connectors .jms .JmsConnector .JNDI_JMS_FACTORY_DEFAULT ;
38
38
import static io .helidon .messaging .connectors .jms .JmsConnector .JNDI_PROPS_ATTRIBUTE ;
39
+ import static io .helidon .messaging .connectors .jms .JmsConnector .NAMED_FACTORY_ATTRIBUTE ;
39
40
40
41
/**
41
42
* Context related to one actual connection being constructed by JMS connector.
@@ -68,7 +69,8 @@ public class ConnectionContext {
68
69
}
69
70
70
71
boolean isJndi () {
71
- return config .get (JNDI_ATTRIBUTE ).exists ();
72
+ return config .get (JNDI_ATTRIBUTE ).exists ()
73
+ && !config .get (NAMED_FACTORY_ATTRIBUTE ).exists ();
72
74
}
73
75
74
76
Optional <? extends ConnectionFactory > lookupFactory () {
Original file line number Diff line number Diff line change @@ -97,12 +97,14 @@ static <T> T executeInIsolation(IsolationSupplier<T> supplier) {
97
97
98
98
boolean inWlsJar (String name ) {
99
99
// Load jms exceptions from inside the thin jar to avoid deserialization issues
100
- if (name .startsWith ("javax.jms" ) && name .endsWith ("Exception" )) {
100
+ if ((name .startsWith ("javax.jms" ) || name .startsWith ("jakarta.jms" ))
101
+ && name .endsWith ("Exception" )) {
101
102
return true ;
102
103
}
103
104
104
- // Load only javax JMS API from outside, so cast works
105
+ // Load only javax and jakarta JMS API from outside, so cast works
105
106
return !name .startsWith ("javax.jms" )
107
+ && !name .startsWith ("jakarta.jms" )
106
108
&& !name .equals (IsolatedContextFactory .class .getName ());
107
109
}
108
110
Original file line number Diff line number Diff line change 14
14
# limitations under the License.
15
15
#
16
16
17
- pattern =weblogic.**;java.util.**;java.lang.**;java.io.**;java.rmi.**
17
+ pattern =weblogic.**;java.util.**;java.lang.**;java.io.**;java.rmi.**;javax.naming.**
You can’t perform that action at this time.
0 commit comments