You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/10/10 08:56:06 UTC
[activemq-artemis] branch main updated: ARTEMIS-4020: restore some gates I had stashed changes to undo removals for
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 7b3c185bba ARTEMIS-4020: restore some gates I had stashed changes to undo removals for
7b3c185bba is described below
commit 7b3c185bba90fa50a7b78c1ac2534fe43dd41927
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Oct 10 09:55:03 2022 +0100
ARTEMIS-4020: restore some gates I had stashed changes to undo removals for
---
.../cli/commands/tools/xml/XmlDataImporter.java | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
index 34768977f1..545cdd7968 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
@@ -248,7 +248,10 @@ public final class XmlDataImporter extends ActionAbstract {
}
try {
while (reader.hasNext()) {
- logger.debug("EVENT:[{}][{}] ", reader.getLocation().getLineNumber(), reader.getLocation().getColumnNumber());
+ if (logger.isDebugEnabled()) {
+ logger.debug("EVENT:[{}][{}] ", reader.getLocation().getLineNumber(), reader.getLocation().getColumnNumber());
+ }
+
if (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
if (XmlDataConstants.OLD_BINDING.equals(reader.getLocalName())) {
oldBinding(); // export from 1.x
@@ -313,13 +316,17 @@ public final class XmlDataImporter extends ActionAbstract {
ClientMessage managementMessage = managementSession.createMessage(false);
ManagementHelper.putAttribute(managementMessage, ResourceNames.QUEUE + queue, "ID");
managementSession.start();
- logger.debug("Requesting ID for: {}", queue);
+ if (debugLog) {
+ logger.debug("Requesting ID for: {}", queue);
+ }
ClientMessage reply = requestor.request(managementMessage);
Number idObject = (Number) ManagementHelper.getResult(reply);
queueID = idObject.longValue();
}
- logger.debug("ID for {} is: {}", queue, queueID);
+ if (debugLog) {
+ logger.debug("ID for {} is: {}", queue, queueID);
+ }
queueIDs.put(queue, queueID); // store it so we don't have to look it up every time
}
@@ -419,7 +426,9 @@ public final class XmlDataImporter extends ActionAbstract {
if (!queueQuery.isExists()) {
session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(routingType).setFilterString(filter));
- logger.debug("Binding queue(name={}, address={}, filter={})", queueName, address, filter);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Binding queue(name={}, address={}, filter={})", queueName, address, filter);
+ }
} else {
logger.debug("Binding {} already exists so won't re-bind.", queueName);
}
@@ -457,7 +466,9 @@ public final class XmlDataImporter extends ActionAbstract {
if (!queueQuery.isExists()) {
session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(RoutingType.valueOf(routingType)).setFilterString(filter));
- logger.debug("Binding queue(name={}, address={}, filter={})", queueName, address, filter);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Binding queue(name={}, address={}, filter={})", queueName, address, filter);
+ }
} else {
logger.debug("Binding {} already exists so won't re-bind.", queueName);
}