ARTEMIS-6034 Close the connection factory when the CLI perf client command ends

Author: brusdev

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/perf/PerfClientCommand.java

@@ -31,6 +31,7 @@
 import io.netty.channel.EventLoop;
 import org.apache.activemq.artemis.cli.commands.ActionContext;
 import org.apache.activemq.artemis.cli.commands.messages.ConnectionProtocol;
+import org.apache.activemq.artemis.cli.factory.ConnectionFactoryClosable;
 import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -98,7 +99,6 @@ public class PerfClientCommand extends PerfCommand {
    protected void onExecuteBenchmark(final ConnectionFactory producerConnectionFactory, final Destination[] jmsDestinations, final ActionContext context) throws Exception {
       final ConnectionProtocol listenerProtocol = Objects.requireNonNullElse(this.consumerProtocol, protocol);
       final String listenerUrl = Objects.requireNonNullElse(this.consumerUrl, brokerURL);
-      final ConnectionFactory consumerConnectionFactory = createConnectionFactory(listenerUrl, user, password, null, listenerProtocol);
       if (consumerConnections == 0) {
          if (sharedSubscription > 0) {
             if (getClientID() == null) {
@@ -122,17 +122,18 @@ protected void onExecuteBenchmark(final ConnectionFactory producerConnectionFact
       boolean warmingUp = warmup != 0;
       final LiveStatistics statistics;
       final StringBuilder skratchBuffer = new StringBuilder();
-      try (MessageListenerBenchmark consumerBenchmark = new MessageListenerBenchmarkBuilder()
-         .setClientID(getClientID())
-         .setDestinations(consumerProtocol != null ? lookupDestinations(consumerConnectionFactory) : jmsDestinations)
-         .setFactory(consumerConnectionFactory)
-         .setTransacted(transaction)
-         .setConsumers(consumersPerDestination)
-         .setConnections(consumerConnections)
-         .setTimeProvider(() -> TimeUnit.NANOSECONDS.toMicros(System.nanoTime()))
-         .setCanDelayMessageCount(true)
-         .setSharedSubscription(sharedSubscription)
-         .setDurableSubscription(durableSubscription)
+      try (ConnectionFactoryClosable consumerConnectionFactory = createConnectionFactory(listenerUrl, user, password, null, listenerProtocol);
+           MessageListenerBenchmark consumerBenchmark = new MessageListenerBenchmarkBuilder()
+            .setClientID(getClientID())
+            .setDestinations(consumerProtocol != null ? lookupDestinations(consumerConnectionFactory) : jmsDestinations)
+            .setFactory(consumerConnectionFactory)
+            .setTransacted(transaction)
+            .setConsumers(consumersPerDestination)
+            .setConnections(consumerConnections)
+            .setTimeProvider(() -> TimeUnit.NANOSECONDS.toMicros(System.nanoTime()))
+            .setCanDelayMessageCount(true)
+            .setSharedSubscription(sharedSubscription)
+            .setDurableSubscription(durableSubscription)
             .createMessageListenerBenchmark()) {
 
          final DefaultEventLoopGroup eventLoopGroup = new DefaultEventLoopGroup(threads) {