Skip to content

Commit d3d5f9b

Browse files
author
James Sörling
committed
prepare for 3.6.1 release
1 parent 69b4280 commit d3d5f9b

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '2'
22
services:
33
wildfly:
4-
image: uvms/wildfly-release:3.6.0
4+
image: uvms/wildfly-release:3.6.1
55
container_name: wildfly
66
ports:
77
- "29990:9990"
@@ -18,12 +18,12 @@ services:
1818
- activemq
1919
command: ["/opt/jboss/start.sh", "/opt/jboss/wildfly/bin/standalone.sh", "-c", "standalone-uvms.xml", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0", "--debug"]
2020
postgres:
21-
image: uvms/postgres-release:3.6.0
21+
image: uvms/postgres-release:3.6.1
2222
container_name: postgres
2323
ports:
2424
- "25432:5432"
2525
activemq:
26-
image: uvms/activemq:3.6.0
26+
image: uvms/activemq:3.6.1
2727
container_name: activemq
2828
ports:
2929
- "18161:8161"

release-test/src/test/java/eu/europa/ec/fisheries/uvms/docker/validation/common/MessageHelper.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import javax.jms.Connection;
66
import javax.jms.ConnectionFactory;
77
import javax.jms.DeliveryMode;
8+
import javax.jms.JMSException;
89
import javax.jms.Message;
910
import javax.jms.MessageConsumer;
1011
import javax.jms.MessageListener;
@@ -48,7 +49,7 @@ public static Message getMessageResponse(String queueName, final String msg) thr
4849

4950
return listener.getMessage();
5051
}
51-
52+
5253
public static void sendMessage(String queueName, final String msg) throws Exception {
5354
String responseQueueName = queueName + "Response" + UUID.randomUUID().toString().replaceAll("-", "");
5455

@@ -67,8 +68,9 @@ public static void sendMessage(String queueName, final String msg) throws Except
6768
createTextMessage.setJMSReplyTo(responseQueue);
6869
messageProducer.send(createTextMessage);
6970
session.close();
71+
connection.close();
7072
}
71-
73+
7274

7375
private static void setupResponseConsumer(String queueName, ResponseQueueMessageListener listener) throws Exception {
7476
Connection consumerConnection = connectionFactory.createConnection();
@@ -78,16 +80,28 @@ private static void setupResponseConsumer(String queueName, ResponseQueueMessage
7880
MessageConsumer consumer = session.createConsumer(responseQueue);
7981

8082
consumer.setMessageListener(listener);
83+
listener.setConsumerConnection(consumerConnection);
8184
consumerConnection.start();
8285

8386
}
8487

8588
private static class ResponseQueueMessageListener implements MessageListener {
8689
private volatile Message message = null;
90+
private Connection consumerConnection;
91+
92+
93+
public void setConsumerConnection(Connection consumerConnection) {
94+
this.consumerConnection = consumerConnection;
95+
}
8796

8897
@Override
8998
public void onMessage(Message message) {
9099
this.message = message;
100+
try {
101+
this.consumerConnection.close();
102+
} catch (JMSException e) {
103+
e.printStackTrace();
104+
}
91105
}
92106

93107
public Message getMessage() {

0 commit comments

Comments
 (0)