Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-4020: restore some gates I had stashed changes to undo removals for

This commit is contained in:
Robbie Gemmell 2022-10-10 09:55:03 +01:00
parent 617269319a
commit 7b3c185bba
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
View File

@ -248,7 +248,10 @@ public final class XmlDataImporter extends ActionAbstract {
} }
try { try {
while (reader.hasNext()) { 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 (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
if (XmlDataConstants.OLD_BINDING.equals(reader.getLocalName())) { if (XmlDataConstants.OLD_BINDING.equals(reader.getLocalName())) {
oldBinding(); // export from 1.x oldBinding(); // export from 1.x
@ -313,13 +316,17 @@ public final class XmlDataImporter extends ActionAbstract {
ClientMessage managementMessage = managementSession.createMessage(false); ClientMessage managementMessage = managementSession.createMessage(false);
ManagementHelper.putAttribute(managementMessage, ResourceNames.QUEUE + queue, "ID"); ManagementHelper.putAttribute(managementMessage, ResourceNames.QUEUE + queue, "ID");
managementSession.start(); managementSession.start();
logger.debug("Requesting ID for: {}", queue); if (debugLog) {
logger.debug("Requesting ID for: {}", queue);
}
ClientMessage reply = requestor.request(managementMessage); ClientMessage reply = requestor.request(managementMessage);
Number idObject = (Number) ManagementHelper.getResult(reply); Number idObject = (Number) ManagementHelper.getResult(reply);
queueID = idObject.longValue(); 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 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()) { if (!queueQuery.isExists()) {
session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(routingType).setFilterString(filter)); 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 { } else {
logger.debug("Binding {} already exists so won't re-bind.", queueName); logger.debug("Binding {} already exists so won't re-bind.", queueName);
} }
@ -457,7 +466,9 @@ public final class XmlDataImporter extends ActionAbstract {
if (!queueQuery.isExists()) { if (!queueQuery.isExists()) {
session.createQueue(new QueueConfiguration(queueName).setAddress(address).setRoutingType(RoutingType.valueOf(routingType)).setFilterString(filter)); 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 { } else {
logger.debug("Binding {} already exists so won't re-bind.", queueName); logger.debug("Binding {} already exists so won't re-bind.", queueName);
} }