From 87efe77c787b487393bfb95fc75b3d4da87925e2 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Mon, 14 Aug 2023 20:41:24 +0200
Subject: [PATCH] revert activemq to v5.17.x

---
 qserv/pom.xml                                         | 11 ++---------
 .../main/java/de/hsadmin/core/qserv/QueueServer.java  |  8 +++++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/qserv/pom.xml b/qserv/pom.xml
index 785d36d..d756d7f 100644
--- a/qserv/pom.xml
+++ b/qserv/pom.xml
@@ -43,15 +43,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-all</artifactId>
-			<version>5.18.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jms_1.1_spec</artifactId>
-			<version>1.1.1</version>
-			<scope>provided</scope>
+			<artifactId>activemq-client</artifactId>
+			<version>5.17.5</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java b/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java
index f98596e..34660d4 100644
--- a/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java
+++ b/qserv/src/main/java/de/hsadmin/core/qserv/QueueServer.java
@@ -164,9 +164,11 @@ public class QueueServer implements MessageListener, ExceptionListener {
 	protected void sendStatus(TaskTransfer queueMessage) {
 		final ActiveMQConnectionFactory mqConnectionFactory = new ActiveMQConnectionFactory(jmsUrl);
 		mqConnectionFactory.setTrustAllPackages(true);
+		QueueConnection queueConnection = null;
 		MessageProducer producer = null;
 		QueueSession session = null;
-		try (QueueConnection queueConnection = mqConnectionFactory.createQueueConnection(jmsUsername, jmsPassword)) {
+		try {
+			queueConnection = mqConnectionFactory.createQueueConnection(jmsUsername, jmsPassword);
 			queueConnection.setExceptionListener(this);
 			session = queueConnection.createQueueSession(false, QueueSession.CLIENT_ACKNOWLEDGE);
 			final Queue queue = session.createQueue(jmsStatusQueue);
@@ -177,6 +179,10 @@ public class QueueServer implements MessageListener, ExceptionListener {
 			producer.send(statusMessage);
 		} catch (Exception statusException) {
 			logger.log(Level.SEVERE, statusException.getMessage(), statusException);
+		} finally {
+			if (producer != null) try { producer.close(); } catch (Exception e) { }
+			if (session != null) try { session.close(); } catch (Exception e) { }
+			if (queueConnection != null) try { queueConnection.close(); } catch (Exception e) { }
 		}
 	
 	}