Fix potential NPE

quarkiverse · Aug 30, 2023 · ab2a6cb · ab2a6cb
1 parent 99b9b64
commit ab2a6cb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/...s/artemis-jms/src/main/java/io/quarkiverse/ironjacamar/ArtemisResourceAdapterFactory.java b/...s/artemis-jms/src/main/java/io/quarkiverse/ironjacamar/ArtemisResourceAdapterFactory.java
@@ -46,14 +46,14 @@ public ManagedConnectionFactory createManagedConnectionFactory(ResourceAdapter a
     @Override
     public ActivationSpec createActivationSpec(ResourceAdapter adapter, Class<?> type, Map<String, String> config)
             throws ResourceException {
-        //TODO: Use the config
         ActiveMQActivationSpec activationSpec = new ActiveMQActivationSpec();
         activationSpec.setResourceAdapter(adapter);
         activationSpec.setDestinationType(config.get("destination-type"));
         activationSpec.setDestination(config.get("destination"));
-        activationSpec.setMaxSession(Integer.valueOf(config.getOrDefault("max-session", "2")));
+        activationSpec.setMaxSession(Integer.valueOf(config.getOrDefault("max-session", "5")));
         activationSpec.setRebalanceConnections(Boolean.valueOf(config.getOrDefault("rebalance-connections", "true")));
         activationSpec.setUseJNDI(false);
+        activationSpec.setUseLocalTx(false);
         return activationSpec;
     }
 

diff --git a/...gration-tests/artemis-jms/src/main/java/io/quarkiverse/ironjacamar/MyMessageEndpoint.java b/...gration-tests/artemis-jms/src/main/java/io/quarkiverse/ironjacamar/MyMessageEndpoint.java
@@ -14,6 +14,7 @@ public class MyMessageEndpoint implements MessageListener {
     @Transactional(Transactional.TxType.REQUIRES_NEW)
     public void onMessage(Message message) {
         try {
+            Log.infof("Redelivered: %s",message.getJMSRedelivered());
             Log.infof("Transaction is Active? %s", QuarkusTransaction.isActive());
             String body = message.getBody(String.class);
             Log.infof("Received message: %s", body);

diff --git a/integration-tests/artemis-jms/src/test/resources/broker.xml b/integration-tests/artemis-jms/src/test/resources/broker.xml
@@ -14,5 +14,18 @@
 
         <max-disk-usage>-1</max-disk-usage>
         <security-enabled>false</security-enabled>
+        <addresses>
+            <address name="MyQueue">
+                <anycast>
+                    <queue name="MyQueue"/>
+                </anycast>
+            </address>
+        </addresses>
+        <address-settings>
+            <address-setting match="MyQueue">
+                <dead-letter-address>MyQueueDLQ</dead-letter-address>
+                <expiry-address>MyQueueExpiry</expiry-address>
+            </address-setting>
+        </address-settings>
     </core>
 </configuration>
diff --git a/runtime/src/main/java/io/quarkiverse/ironjacamar/runtime/IronJacamarSupport.java b/runtime/src/main/java/io/quarkiverse/ironjacamar/runtime/IronJacamarSupport.java
@@ -60,8 +60,10 @@ public void activateEndpoint(String containerId, String activationSpecConfigId,
             throw new RuntimeException(e);
         }
         Map<String, String> config = new HashMap<>(buildTimeConfig);
-        // TODO: May throw NPE?
-        config.putAll(this.runtimeConfig.activationSpecs().map().get(activationSpecConfigId).config());
+        var activationSpecConfig = runtimeConfig.activationSpecs().map().get(activationSpecConfigId);
+        if (activationSpecConfig != null) {
+            config.putAll(activationSpecConfig.config());
+        }
         try {
             ijContainer.endpointActivation(endpointClass, containerId, config);
         } catch (ResourceException e) {