[activemq-artemis] branch master updated: ARTEMIS-2625 testListConsumers failing on IBM JDK 8

[jbertram]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new de113e4  ARTEMIS-2625 testListConsumers failing on IBM JDK 8
     new 34f2fc8  This closes #2988
de113e4 is described below

commit de113e47ae4798427915c7dbb1d08433065e48f5
Author: brusdev <bruscin...@gmail.com>
AuthorDate: Fri Feb 21 06:48:58 2020 +0100

    ARTEMIS-2625 testListConsumers failing on IBM JDK 8
    
    Fix JmxServerControlTest.testListConsumers.
---
 .../tests/smoke/jmx2/JmxServerControlTest.java     | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git 
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
 
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
index b0abf59..c2a625f 100644
--- 
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
+++ 
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.activemq.artemis.tests.smoke.jmx2;
 
+import javax.jms.MessageConsumer;
 import javax.jms.Session;
 import javax.json.JsonArray;
 import javax.json.JsonObject;
@@ -87,18 +88,22 @@ public class JmxServerControlTest extends SmokeTestBase {
          activeMQServerControl.createQueue(addressName, queueName, 
RoutingType.ANYCAST.name());
          String uri = "tcp://localhost:61616";
          try (ActiveMQConnectionFactory cf = 
ActiveMQJMSClient.createConnectionFactory(uri, null)) {
-            cf.createConnection().createSession(true, 
Session.SESSION_TRANSACTED).createConsumer(new ActiveMQQueue(queueName));
-
-            String options = 
JsonUtil.toJsonObject(ImmutableMap.of("field","queue", "operation", "EQUALS", 
"value", queueName)).toString();
-            String consumersAsJsonString = 
activeMQServerControl.listConsumers(options, 1, 10);
-
-            JsonObject consumersAsJsonObject = 
JsonUtil.readJsonObject(consumersAsJsonString);
-            JsonArray array = (JsonArray) consumersAsJsonObject.get("data");
-
-            Assert.assertEquals("number of consumers returned from query", 1, 
array.size());
-            JsonObject jsonConsumer = array.getJsonObject(0);
-            Assert.assertEquals("queue name in consumer", queueName, 
jsonConsumer.getString("queue"));
-            Assert.assertEquals("address name in consumer", addressName, 
jsonConsumer.getString("address"));
+            MessageConsumer consumer = 
cf.createConnection().createSession(true, 
Session.SESSION_TRANSACTED).createConsumer(new ActiveMQQueue(queueName));
+
+            try {
+               String options = 
JsonUtil.toJsonObject(ImmutableMap.of("field","queue", "operation", "EQUALS", 
"value", queueName)).toString();
+               String consumersAsJsonString = 
activeMQServerControl.listConsumers(options, 1, 10);
+
+               JsonObject consumersAsJsonObject = 
JsonUtil.readJsonObject(consumersAsJsonString);
+               JsonArray array = (JsonArray) consumersAsJsonObject.get("data");
+
+               Assert.assertEquals("number of consumers returned from query", 
1, array.size());
+               JsonObject jsonConsumer = array.getJsonObject(0);
+               Assert.assertEquals("queue name in consumer", queueName, 
jsonConsumer.getString("queue"));
+               Assert.assertEquals("address name in consumer", addressName, 
jsonConsumer.getString("address"));
+            } finally {
+               consumer.close();
+            }
          }
       } finally {
          jmxConnector.close();