This closes #813

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java

@@ -326,7 +326,7 @@ public final class XmlDataImporter extends ActionAbstract {
             // Get the ID of the queues involved so the message can be routed properly.  This is done because we cannot
             // send directly to a queue, we have to send to an address instead but not all the queues related to the
             // address may need the message
-            ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management");
+            try (ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management")) {
                ClientMessage managementMessage = managementSession.createMessage(false);
                ManagementHelper.putAttribute(managementMessage, "core.queue." + queue, "ID");
                managementSession.start();
@@ -336,7 +336,7 @@ public final class XmlDataImporter extends ActionAbstract {
                ClientMessage reply = requestor.request(managementMessage);
                Number idObject = (Number) ManagementHelper.getResult(reply);
                queueID = idObject.longValue();
-            requestor.close();
+            }
             if (logger.isDebugEnabled()) {
                logger.debug("ID for " + queue + " is: " + queueID);
             }
@@ -825,7 +825,7 @@ public final class XmlDataImporter extends ActionAbstract {
          reader.next();
       }
 
-      ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management");
+      try (ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management")) {
          ClientMessage managementMessage = managementSession.createMessage(false);
          ManagementHelper.putOperationInvocation(managementMessage, ResourceNames.JMS_SERVER, "createConnectionFactory", name, Boolean.parseBoolean(ha), discoveryGroupName.length() > 0, Integer.parseInt(type), connectors, entries, clientId, Long.parseLong(clientFailureCheckPeriod), Long.parseLong(connectionTtl), Long.parseLong(callTimeout), Long.parseLong(callFailoverTimeout), Integer.parseInt(minLargeMessageSize), Boolean.parseBoolean(compressLargeMessages), Integer.parseInt(consumerWindowSize), Integer.parseInt(consumerMaxRate), Integer.parseInt(confirmationWindowSize), Integer.parseInt(producerWindowSize), Integer.parseInt(producerMaxRate), Boolean.parseBoolean(blockOnAcknowledge), Boolean.parseBoolean(blockOnDurableSend), Boolean.parseBoolean(blockOnNonDurableSend), Boolean.parseBoolean(autoGroup), Boolean.parseBoolean(preacknowledge), loadBalancingPolicyClassName, Integer.parseInt(transactionBatchSize), Integer.parseInt(dupsOkBatchSize), Boolean.parseBoolean(useGlobalPools), Integer.parseInt(scheduledThreadMaxPoolSize), Integer.parseInt(threadMaxPoolSize), Long.parseLong(retryInterval), Double.parseDouble(retryIntervalMultiplier), Long.parseLong(maxRetryInterval), Integer.parseInt(reconnectAttempts), Boolean.parseBoolean(failoverOnInitialConnection), groupId);
          //Boolean.parseBoolean(cacheLargeMessagesClient));
@@ -838,8 +838,7 @@ public final class XmlDataImporter extends ActionAbstract {
          } else {
             ActiveMQServerLogger.LOGGER.error("Problem creating " + name);
          }
-
+      }
-      requestor.close();
    }
 
    private void createJmsDestination() throws Exception {
@@ -884,7 +883,7 @@ public final class XmlDataImporter extends ActionAbstract {
          reader.next();
       }
 
-      ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management");
+      try (ClientRequestor requestor = new ClientRequestor(managementSession, "jms.queue.activemq.management")) {
          ClientMessage managementMessage = managementSession.createMessage(false);
          if ("Queue".equals(type)) {
             ManagementHelper.putOperationInvocation(managementMessage, ResourceNames.JMS_SERVER, "createQueue", name, entries, selector);
@@ -900,8 +899,7 @@ public final class XmlDataImporter extends ActionAbstract {
          } else {
             ActiveMQServerLogger.LOGGER.error("Problem creating " + name);
          }
-
+      }
-      requestor.close();
    }
 
    private String getEntries() throws Exception {

artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java

@@ -144,10 +144,11 @@ public final class JsonUtil {
                   CompositeData[] cds = new CompositeData[data.length];
                   for (int i1 = 0; i1 < data.length; i1++) {
                      String dataConverted = convertJsonValue(data[i1], String.class).toString();
-                     ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(new ByteArrayInputStream(Base64.decode(dataConverted)));
+                     try (ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(new ByteArrayInputStream(Base64.decode(dataConverted)))) {
                         ois.setWhiteList("java.util,java.lang,javax.management");
                         cds[i1] = (CompositeDataSupport) ois.readObject();
                      }
+                  }
                   innerVal = cds;
                }
 

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/jms/ServerJMSObjectMessage.java

@@ -73,9 +73,10 @@ public class ServerJMSObjectMessage extends ServerJMSMessage implements ObjectMe
       int size = getInnerMessage().getBodyBuffer().readInt();
       byte[] bytes = new byte[size];
       getInnerMessage().getBodyBuffer().readBytes(bytes);
-      ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(new ByteArrayInputStream(bytes));
+      try (ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(new ByteArrayInputStream(bytes))) {
          ois.setWhiteList(DEFAULT_WHITELIST);
          ois.setBlackList(DEFAULT_BLACKLIST);
          object = (Serializable) ois.readObject();
       }
    }
+}

artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/ConsumedObjectMessage.java

@@ -45,8 +45,7 @@ public class ConsumedObjectMessage extends ConsumedMessage {
             byte[] body = new byte[size];
             message.getBodyBuffer().readBytes(body);
             ByteArrayInputStream bais = new ByteArrayInputStream(body);
-            try {
+            try (ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais)) {
-               ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais);
                if (options != null) {
                   ois.setWhiteList(options.getDeserializationWhiteList());
                   ois.setBlackList(options.getDeserializationBlackList());

artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java

@@ -74,8 +74,7 @@ public class HttpMessageHelper {
             message.getBodyBuffer().readBytes(body);
             ByteArrayInputStream bais = new ByteArrayInputStream(body);
             Object obj = null;
-            try {
+            try (ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais)) {
-               ObjectInputStreamWithClassLoader ois = new ObjectInputStreamWithClassLoader(bais);
                if (jmsOptions != null) {
                   ois.setBlackList(jmsOptions.getDeserializationBlackList());
                   ois.setWhiteList(jmsOptions.getDeserializationWhiteList());

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java

@@ -438,17 +438,18 @@ public class ScaleDownHandler {
 
    private Integer getQueueID(ClientSession session, SimpleString queueName) throws Exception {
       Integer queueID = -1;
-      ClientRequestor requestor = new ClientRequestor(session, "jms.queue.activemq.management");
+      Object result;
+      try (ClientRequestor requestor = new ClientRequestor(session, "jms.queue.activemq.management")) {
          ClientMessage managementMessage = session.createMessage(false);
          ManagementHelper.putAttribute(managementMessage, "core.queue." + queueName, "ID");
          session.start();
          logger.debug("Requesting ID for: " + queueName);
          ClientMessage reply = requestor.request(managementMessage);
-      Object result = ManagementHelper.getResult(reply);
+         result = ManagementHelper.getResult(reply);
+      }
       if (result != null && result instanceof Number) {
          queueID = ((Number) result).intValue();
       }
-      requestor.close();
       return queueID;
    }
 

examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemorySchemaPartition.java

@@ -73,9 +73,10 @@ public class InMemorySchemaPartition extends AbstractLdifPartition {
       for (String resourcePath : new TreeSet<>(resMap.keySet())) {
          if (resourcePath.endsWith(".ldif")) {
             URL resource = DefaultSchemaLdifExtractor.getUniqueResource(resourcePath, "Schema LDIF file");
-            LdifReader reader = new LdifReader(resource.openStream());
+            LdifEntry ldifEntry;
-            LdifEntry ldifEntry = reader.next();
+            try (LdifReader reader = new LdifReader(resource.openStream())) {
-            reader.close();
+               ldifEntry = reader.next();
+            }
 
             Entry entry = new DefaultEntry(schemaManager, ldifEntry.getEntry());
             // add mandatory attributes