You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/10/29 09:34:25 UTC
[4/6] qpid-broker-j git commit: NO-JIRA: [Broker-J] Standardise the
name of the static LOGGER field across source code - no functional change
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java b/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
index 4dfcad9..183e162 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
@@ -40,7 +40,7 @@ import org.apache.qpid.server.util.Action;
public class DtxBranch
{
- private static final Logger _logger = LoggerFactory.getLogger(DtxBranch.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DtxBranch.class);
private final Xid _xid;
private final List<ServerTransaction.Action> _postTransactionActions = new ArrayList<ServerTransaction.Action>();
@@ -103,15 +103,15 @@ public class DtxBranch
public void setTimeout(long timeout)
{
- _logger.debug("Setting timeout to {}s for DtxBranch {}", timeout, _xid);
+ LOGGER.debug("Setting timeout to {}s for DtxBranch {}", timeout, _xid);
if(_timeoutFuture != null)
{
- _logger.debug("Attempting to cancel previous timeout task future for DtxBranch {}", _xid);
+ LOGGER.debug("Attempting to cancel previous timeout task future for DtxBranch {}", _xid);
boolean succeeded = _timeoutFuture.cancel(false);
- _logger.debug("Cancelling previous timeout task {} for DtxBranch {}", (succeeded ? "succeeded" : "failed"), _xid);
+ LOGGER.debug("Cancelling previous timeout task {} for DtxBranch {}", (succeeded ? "succeeded" : "failed"), _xid);
}
_timeout = timeout;
@@ -125,14 +125,14 @@ public class DtxBranch
{
long delay = 1000*_timeout;
- _logger.debug("Scheduling timeout and rollback after {}s for DtxBranch {}", delay/1000, _xid);
+ LOGGER.debug("Scheduling timeout and rollback after {}s for DtxBranch {}", delay/1000, _xid);
_timeoutFuture = _dtxRegistry.scheduleTask(delay, new Runnable()
{
@Override
public void run()
{
- _logger.debug("Timing out DtxBranch {}", _xid);
+ LOGGER.debug("Timing out DtxBranch {}", _xid);
setState(State.TIMEDOUT);
rollback();
@@ -209,7 +209,7 @@ public class DtxBranch
public void prepare() throws StoreException
{
- _logger.debug("Performing prepare for DtxBranch {}", _xid);
+ LOGGER.debug("Performing prepare for DtxBranch {}", _xid);
Transaction txn = _dtxRegistry.getMessageStore().newTransaction();
_storedXidRecord = txn.recordXid(_xid.getFormat(),
@@ -224,16 +224,16 @@ public class DtxBranch
public synchronized void rollback() throws StoreException
{
- _logger.debug("Performing rollback for DtxBranch {}", _xid);
+ LOGGER.debug("Performing rollback for DtxBranch {}", _xid);
if(_timeoutFuture != null)
{
- _logger.debug("Attempting to cancel previous timeout task future for DtxBranch {}", _xid);
+ LOGGER.debug("Attempting to cancel previous timeout task future for DtxBranch {}", _xid);
boolean succeeded = _timeoutFuture.cancel(false);
_timeoutFuture = null;
- _logger.debug("Cancelling previous timeout task {} for DtxBranch {}", (succeeded ? "succeeded" : "failed"), _xid);
+ LOGGER.debug("Cancelling previous timeout task {} for DtxBranch {}", (succeeded ? "succeeded" : "failed"), _xid);
}
if(_transaction != null)
@@ -256,16 +256,16 @@ public class DtxBranch
public void commit() throws StoreException
{
- _logger.debug("Performing commit for DtxBranch {}", _xid);
+ LOGGER.debug("Performing commit for DtxBranch {}", _xid);
if(_timeoutFuture != null)
{
- _logger.debug("Attempting to cancel previous timeout task future for DtxBranch {}", _xid);
+ LOGGER.debug("Attempting to cancel previous timeout task future for DtxBranch {}", _xid);
boolean succeeded = _timeoutFuture.cancel(false);
_timeoutFuture = null;
- _logger.debug("Cancelling previous timeout task {} for DtxBranch {}", (succeeded ? "succeeded" : "failed"), _xid);
+ LOGGER.debug("Cancelling previous timeout task {} for DtxBranch {}", (succeeded ? "succeeded" : "failed"), _xid);
}
if(_transaction == null)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
index 767e0ca..286715c 100755
--- a/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java
@@ -48,7 +48,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
*/
public class LocalTransaction implements ServerTransaction
{
- protected static final Logger _logger = LoggerFactory.getLogger(LocalTransaction.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(LocalTransaction.class);
private final List<Action> _postTransactionActions = new ArrayList<>();
private final TransactionObserver _transactionObserver;
@@ -112,9 +112,9 @@ public class LocalTransaction implements ServerTransaction
{
try
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Dequeue of message number " + record.getMessageNumber() + " from transaction log. Queue : " + record.getQueueId());
+ LOGGER.debug("Dequeue of message number " + record.getMessageNumber() + " from transaction log. Queue : " + record.getQueueId());
}
beginTranIfNecessary();
@@ -142,9 +142,9 @@ public class LocalTransaction implements ServerTransaction
final MessageEnqueueRecord record = entry.getEnqueueRecord();
if(record != null)
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Dequeue of message number " + record.getMessageNumber() + " from transaction log. Queue : " + record.getQueueId());
+ LOGGER.debug("Dequeue of message number " + record.getMessageNumber() + " from transaction log. Queue : " + record.getQueueId());
}
beginTranIfNecessary();
@@ -202,9 +202,9 @@ public class LocalTransaction implements ServerTransaction
{
try
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Enqueue of message number " + message.getMessageNumber() + " to transaction log. Queue : " + queue.getName());
+ LOGGER.debug("Enqueue of message number " + message.getMessageNumber() + " to transaction log. Queue : " + queue.getName());
}
beginTranIfNecessary();
@@ -291,9 +291,9 @@ public class LocalTransaction implements ServerTransaction
{
if(queue.getMessageDurability().persist(message.isPersistent()))
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Enqueue of message number " + message.getMessageNumber() + " to transaction log. Queue : " + queue.getName() );
+ LOGGER.debug("Enqueue of message number " + message.getMessageNumber() + " to transaction log. Queue : " + queue.getName() );
}
beginTranIfNecessary();
@@ -438,14 +438,14 @@ public class LocalTransaction implements ServerTransaction
private void doPostTransactionActions()
{
- _logger.debug("Beginning {} post transaction actions", _postTransactionActions.size());
+ LOGGER.debug("Beginning {} post transaction actions", _postTransactionActions.size());
for(int i = 0; i < _postTransactionActions.size(); i++)
{
_postTransactionActions.get(i).postCommit();
}
- _logger.debug("Completed post transaction actions");
+ LOGGER.debug("Completed post transaction actions");
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 062b48d..d6bc757 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -162,7 +162,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
private static final String USE_ASYNC_RECOVERY = "use_async_message_store_recovery";
- private static final Logger _logger = LoggerFactory.getLogger(AbstractVirtualHost.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractVirtualHost.class);
private static final int HOUSEKEEPING_SHUTDOWN_TIMEOUT = 5;
@@ -315,7 +315,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
if(!((SystemConfig)_broker.getParent()).isManagementMode())
{
List<VirtualHostAccessControlProvider> children = new ArrayList<>(getChildren(VirtualHostAccessControlProvider.class));
- _logger.debug("Updating access control list with {} provider children", children.size());
+ LOGGER.debug("Updating access control list with {} provider children", children.size());
Collections.sort(children, VirtualHostAccessControlProvider.ACCESS_CONTROL_PROVIDER_COMPARATOR);
List<AccessControl<?>> accessControls = new ArrayList<>(children.size()+2);
@@ -562,7 +562,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
catch(Exception e)
{
- _logger.warn("Failed to close database", e);
+ LOGGER.warn("Failed to close database", e);
}
}
}
@@ -1204,7 +1204,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
catch (InterruptedException e)
{
- _logger.warn("Interrupted during Housekeeping shutdown:", e);
+ LOGGER.warn("Interrupted during Housekeeping shutdown:", e);
Thread.currentThread().interrupt();
}
finally
@@ -1344,7 +1344,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
catch (RuntimeException e)
{
- _logger.info("Unable to auto create a node named {} due to exception", name, e);
+ LOGGER.info("Unable to auto create a node named {} due to exception", name, e);
}
}
@@ -1432,7 +1432,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
{
if (!houseKeepingTaskExecutor.isShutdown())
{
- _logger.warn("Failed to schedule reallocation of messages", e);
+ LOGGER.warn("Failed to schedule reallocation of messages", e);
}
}
}
@@ -1584,9 +1584,9 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
private ListenableFuture<Void> closeConnections()
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Closing connection registry : {} connection(s).", _connections.size());
+ LOGGER.debug("Closing connection registry : {} connection(s).", _connections.size());
}
_acceptsConnections.set(false);
for(AMQPConnection<?> conn : _connections)
@@ -1607,7 +1607,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
catch (Exception e)
{
- _logger.warn("Exception closing connection " + connection.getName() + " from " + connection.getRemoteAddress(), e);
+ LOGGER.warn("Exception closing connection " + connection.getName() + " from " + connection.getRemoteAddress(), e);
}
finally
{
@@ -1635,7 +1635,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
catch (StoreException e)
{
- _logger.error("Failed to close message store", e);
+ LOGGER.error("Failed to close message store", e);
}
if (!(_virtualHostNode.getConfigurationStore() instanceof MessageStoreProvider))
@@ -1936,7 +1936,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
{
if (q.getState() == State.ACTIVE)
{
- _logger.debug("Checking message status for queue: {}", q.getName());
+ LOGGER.debug("Checking message status for queue: {}", q.getName());
q.checkMessageStatus();
}
}
@@ -2345,7 +2345,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
catch (Exception e)
{
- _logger.warn("Exception occurred on preference store deletion", e);
+ LOGGER.warn("Exception occurred on preference store deletion", e);
}
finally
{
@@ -2366,7 +2366,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
}
catch (Exception e)
{
- _logger.warn( "Exception occurred on message store deletion", e);
+ LOGGER.warn( "Exception occurred on message store deletion", e);
}
finally
{
@@ -2678,7 +2678,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
@Override
public void onFailure(final Throwable t)
{
- _logger.error("Exception occurred while opening {} : {}",
+ LOGGER.error("Exception occurred while opening {} : {}",
child.getClass().getSimpleName(), child.getName(), t);
}
@@ -2709,7 +2709,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
if (totalSpace == 0)
{
- _logger.warn("Cannot check file system for disk space because store path '{}' is not valid", _fileSystem.getPath());
+ LOGGER.warn("Cannot check file system for disk space because store path '{}' is not valid", _fileSystem.getPath());
return;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
index 8060fbf..a5a470d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
@@ -67,7 +67,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
{
- private static final Logger _logger = LoggerFactory.getLogger(AsynchronousMessageStoreRecoverer.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AsynchronousMessageStoreRecoverer.class);
private AsynchronousRecoverer _asynchronousRecoverer;
@Override
@@ -177,7 +177,7 @@ public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
if (handler.getNumberOfUnknownMessageInstances() > 0)
{
- _logger.info("Discarded {} entry(s) associated with queue '{}' as the referenced message "
+ LOGGER.info("Discarded {} entry(s) associated with queue '{}' as the referenced message "
+ "does not exist.", handler.getNumberOfUnknownMessageInstances(), queue.getName());
}
@@ -223,7 +223,7 @@ public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
{
if (_continueRecovery.get())
{
- _logger.debug("Message id '{}' is orphaned, removing", storedMessage.getMessageNumber());
+ LOGGER.debug("Message id '{}' is orphaned, removing", storedMessage.getMessageNumber());
storedMessage.remove();
unusedMessageCounter++;
}
@@ -231,7 +231,7 @@ public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
if (unusedMessageCounter > 0)
{
- _logger.info("Discarded {} orphaned message(s).", unusedMessageCounter);
+ LOGGER.info("Discarded {} orphaned message(s).", unusedMessageCounter);
}
messagesToDelete.clear();
@@ -272,7 +272,7 @@ public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
boolean wasShutdown = _queueRecoveryExecutor.awaitTermination(THREAD_POOL_SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);
if (!wasShutdown)
{
- _logger.warn("Failed to gracefully shutdown queue recovery executor within permitted time period");
+ LOGGER.warn("Failed to gracefully shutdown queue recovery executor within permitted time period");
_queueRecoveryExecutor.shutdownNow();
}
}
@@ -536,14 +536,14 @@ public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
if (message != null)
{
- _logger.debug("Delivering message id '{}' to queue '{}'", message.getMessageNumber(), queueName);
+ LOGGER.debug("Delivering message id '{}' to queue '{}'", message.getMessageNumber(), queueName);
_queue.recover(message, record);
_recoveredCount++;
}
else
{
- _logger.debug("Message id '{}' referenced in log as enqueued in queue '{}' is unknown, entry will be discarded",
+ LOGGER.debug("Message id '{}' referenced in log as enqueued in queue '{}' is unknown, entry will be discarded",
messageId, queueName);
Transaction txn = _store.newTransaction();
txn.dequeueMessage(record);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
index 57feeb6..9402ca3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
@@ -58,7 +58,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
{
- private static final Logger _logger = LoggerFactory.getLogger(SynchronousMessageStoreRecoverer.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SynchronousMessageStoreRecoverer.class);
@Override
public ListenableFuture<Void> recover(QueueManagingVirtualHost<?> virtualHost)
@@ -94,7 +94,7 @@ public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
if (!unknownQueuesWithMessages.isEmpty())
{
unknownQueuesWithMessages.forEach((queueId, count) -> {
- _logger.info("Discarded {} entry(s) associated with queue id '{}' as a queue with this "
+ LOGGER.info("Discarded {} entry(s) associated with queue id '{}' as a queue with this "
+ "id does not appear in the configuration.",
count, queueId);
});
@@ -102,7 +102,7 @@ public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
if (!queuesWithUnknownMessages.isEmpty())
{
queuesWithUnknownMessages.forEach((queue, count) -> {
- _logger.info("Discarded {} entry(s) associated with queue '{}' as the referenced message "
+ LOGGER.info("Discarded {} entry(s) associated with queue '{}' as the referenced message "
+ "does not exist.",
count, queue.getName());
});
@@ -132,13 +132,13 @@ public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
for(StoredMessage<?> m : unusedMessages.values())
{
- _logger.debug("Message id '{}' is orphaned, removing", m.getMessageNumber());
+ LOGGER.debug("Message id '{}' is orphaned, removing", m.getMessageNumber());
m.remove();
}
if (unusedMessages.size() > 0)
{
- _logger.info("Discarded {} orphaned message(s).", unusedMessages.size());
+ LOGGER.info("Discarded {} orphaned message(s).", unusedMessages.size());
}
eventLogger.message(logSubject, TransactionLogMessages.RECOVERY_COMPLETE(null, false));
@@ -230,7 +230,7 @@ public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
if (message != null)
{
- _logger.debug("Delivering message id '{}' to queue '{}'", message.getMessageNumber(), queueName);
+ LOGGER.debug("Delivering message id '{}' to queue '{}'", message.getMessageNumber(), queueName);
_queueRecoveries.merge(queue, 1, (old, unused) -> old + 1);
@@ -240,7 +240,7 @@ public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
}
else
{
- _logger.debug("Message id '{}' referenced in log as enqueued in queue '{}' is unknown, entry will be discarded",
+ LOGGER.debug("Message id '{}' referenced in log as enqueued in queue '{}' is unknown, entry will be discarded",
messageId, queueName);
_queuesWithUnknownMessages.merge(queue, 1, (old, unused) -> old + 1);
@@ -249,7 +249,7 @@ public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
}
else
{
- _logger.debug(
+ LOGGER.debug(
"Message id '{}' in log references queue with id '{}' which is not in the configuration, entry will be discarded",
messageId, queueId);
_unknownQueuesWithMessages.merge(queueId, 1, (old, unused) -> old + 1);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
index c268e87..c13edc5 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
@@ -78,7 +78,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
abstract class AbstractQueueTestBase extends QpidTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(AbstractQueueTestBase.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractQueueTestBase.class);
private Queue<?> _queue;
private QueueManagingVirtualHost<?> _virtualHost;
private String _qname = "qname";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
index 11bdef1..5ca6d10 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
@@ -37,7 +37,7 @@ import org.apache.qpid.server.util.FileUtils;
public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase implements EventListener, TransactionLogResource
{
- private static final Logger _logger = LoggerFactory.getLogger(MessageStoreQuotaEventsTestBase.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(MessageStoreQuotaEventsTestBase.class);
protected static final byte[] MESSAGE_DATA = new byte[32 * 1024];
@@ -129,7 +129,7 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple
@Override
public void event(Event event)
{
- _logger.debug("Test event listener received event " + event);
+ LOGGER.debug("Test event listener received event " + event);
_events.add(event);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
index d5b61e5..0662691 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
@@ -44,7 +44,7 @@ import org.apache.qpid.server.security.access.plugins.RuleOutcome;
public final class AclFileParser
{
- private static final Logger _logger = LoggerFactory.getLogger(AclFileParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AclFileParser.class);
public static final String DEFAULT_ALLOW = "defaultallow";
public static final String DEFAULT_DEFER = "defaultdefer";
public static final String DEFAULT_DENY = "defaultdeny";
@@ -117,7 +117,7 @@ public final class AclFileParser
int line = 0;
try(Reader fileReader = configReader)
{
- _logger.debug("About to load ACL file");
+ LOGGER.debug("About to load ACL file");
StreamTokenizer tokenizer = new StreamTokenizer(new BufferedReader(fileReader));
tokenizer.resetSyntax(); // setup the tokenizer
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
index 2ea4ad2..4d2423b 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
@@ -34,7 +34,7 @@ import org.apache.qpid.server.security.access.firewall.FirewallRuleFactory;
*/
public class AclRulePredicates
{
- private static final Logger _logger = LoggerFactory.getLogger(AclRulePredicates.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AclRulePredicates.class);
private static final String SEPARATOR = ",";
@@ -65,7 +65,7 @@ public class AclRulePredicates
addPropertyValue(property, value);
- _logger.debug("Parsed {} with value {}", property, value);
+ LOGGER.debug("Parsed {} with value {}", property, value);
}
private void addPropertyValue(final Property property, final String value)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
index 1b7fa5e..44fa558 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
@@ -41,7 +41,7 @@ import org.apache.qpid.server.security.access.Operation;
public class RuleBasedAccessControl implements AccessControl<CachingSecurityToken>, LegacyAccessControl
{
- private static final Logger _logger = LoggerFactory.getLogger(RuleBasedAccessControl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RuleBasedAccessControl.class);
private final LegacyAccessControlAdapter _adapter;
private RuleSet _ruleSet;
@@ -97,9 +97,9 @@ public class RuleBasedAccessControl implements AccessControl<CachingSecurityToke
}
}
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("Checking " + operation + " " + objectType + " " +
+ LOGGER.debug("Checking " + operation + " " + objectType + " " +
(addressOfClient == null ? "" : addressOfClient));
}
@@ -109,7 +109,7 @@ public class RuleBasedAccessControl implements AccessControl<CachingSecurityToke
}
catch(Exception e)
{
- _logger.error("Unable to check " + operation + " " + objectType + " "
+ LOGGER.error("Unable to check " + operation + " " + objectType + " "
+ (addressOfClient == null ? "" : addressOfClient), e);
return Result.DENIED;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
index a7cdea9..cf439fe 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
@@ -47,7 +47,7 @@ import org.apache.qpid.server.security.access.plugins.RuleOutcome;
*/
public class RuleSet implements EventLoggerProvider
{
- private static final Logger _logger = LoggerFactory.getLogger(RuleSet.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RuleSet.class);
private final List<Rule> _rules;
private final Map<Subject, Map<LegacyOperation, Map<ObjectType, List<Rule>>>> _cache =
@@ -110,13 +110,13 @@ public class RuleSet implements EventLoggerProvider
// Save the rules we selected
objects.put(objectType, filtered);
- _logger.debug("Cached {} RulesList: {}", objectType, filtered);
+ LOGGER.debug("Cached {} RulesList: {}", objectType, filtered);
}
// Return the cached rules
List<Rule> rules = objects.get(objectType);
- _logger.debug("Returning RuleList: {}", rules);
+ LOGGER.debug("Returning RuleList: {}", rules);
return rules;
}
@@ -144,14 +144,14 @@ public class RuleSet implements EventLoggerProvider
{
ClientAction action = new ClientAction(operation, objectType, properties);
- _logger.debug("Checking action: {}", action);
+ LOGGER.debug("Checking action: {}", action);
// get the list of rules relevant for this request
List<Rule> rules = getRules(subject, operation, objectType);
if (rules == null)
{
- _logger.debug("No rules found, returning default result");
+ LOGGER.debug("No rules found, returning default result");
return getDefault();
}
@@ -160,12 +160,12 @@ public class RuleSet implements EventLoggerProvider
for (Rule rule : rules)
{
- _logger.debug("Checking against rule: {}", rule);
+ LOGGER.debug("Checking against rule: {}", rule);
if (action.matches(rule.getAclAction(), addressOfClient))
{
RuleOutcome ruleOutcome = rule.getRuleOutcome();
- _logger.debug("Action matches. Result: {}", ruleOutcome);
+ LOGGER.debug("Action matches. Result: {}", ruleOutcome);
boolean allowed = ruleOutcome.isAllowed();
if(ruleOutcome.isLogged())
{
@@ -189,7 +189,7 @@ public class RuleSet implements EventLoggerProvider
return allowed ? Result.ALLOWED : Result.DENIED;
}
}
- _logger.debug("Deferring result of ACL check");
+ LOGGER.debug("Deferring result of ACL check");
// Defer to the next plugin of this type, if it exists
return Result.DEFER;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
index a771aec..6990634 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
public class HostnameFirewallRule implements FirewallRule
{
- private static final Logger _logger = LoggerFactory.getLogger(HostnameFirewallRule.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(HostnameFirewallRule.class);
private static final long DNS_TIMEOUT = 30000;
private static final ExecutorService DNS_LOOKUP = Executors.newCachedThreadPool();
@@ -51,7 +51,7 @@ public class HostnameFirewallRule implements FirewallRule
_hostnamePatterns[i++] = Pattern.compile(hostname);
}
- _logger.debug("Created {}", this);
+ LOGGER.debug("Created {}", this);
}
@@ -69,15 +69,15 @@ public class HostnameFirewallRule implements FirewallRule
if (hostnameMatches)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("Hostname " + hostname + " matches rule " + pattern.toString());
+ LOGGER.debug("Hostname " + hostname + " matches rule " + pattern.toString());
}
return true;
}
}
- _logger.debug("Hostname {} matches no configured hostname patterns", hostname);
+ LOGGER.debug("Hostname {} matches no configured hostname patterns", hostname);
return false;
}
@@ -107,7 +107,7 @@ public class HostnameFirewallRule implements FirewallRule
}
catch (Exception e)
{
- _logger.warn("Unable to look up hostname from address " + remote, e);
+ LOGGER.warn("Unable to look up hostname from address " + remote, e);
return null;
}
finally
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
index e0f7a09..5e37cf9 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
public class NetworkFirewallRule implements FirewallRule
{
- private static final Logger _logger = LoggerFactory.getLogger(NetworkFirewallRule.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(NetworkFirewallRule.class);
private List<InetNetwork> _networks;
@@ -47,11 +47,11 @@ public class NetworkFirewallRule implements FirewallRule
}
catch (java.net.UnknownHostException uhe)
{
- _logger.error("Cannot resolve address: " + network, uhe);
+ LOGGER.error("Cannot resolve address: " + network, uhe);
}
}
- _logger.debug("Created {}", this);
+ LOGGER.debug("Created {}", this);
}
@Override
@@ -62,13 +62,13 @@ public class NetworkFirewallRule implements FirewallRule
if (network.contains(ip))
{
- _logger.debug("Client address {} matches configured network {}", ip, network);
+ LOGGER.debug("Client address {} matches configured network {}", ip, network);
return true;
}
}
- _logger.debug("Client address {} does not match any configured networks", ip);
+ LOGGER.debug("Client address {} does not match any configured networks", ip);
return false;
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
index be5c1c1..e09b48a 100755
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
@@ -59,7 +59,7 @@ public class AMQPConnection_0_10Impl extends AbstractAMQPConnection<AMQPConnecti
implements
AMQPConnection_0_10<AMQPConnection_0_10Impl>
{
- private static final Logger _logger = LoggerFactory.getLogger(AMQPConnection_0_10Impl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AMQPConnection_0_10Impl.class);
private final ServerInputHandler _inputHandler;
private final ServerConnection _connection;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
index 23747c7..427355b 100755
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
@@ -29,7 +29,7 @@ import org.apache.qpid.server.message.MessageInstanceConsumer;
class ExplicitAcceptDispositionChangeListener implements ServerSession.MessageDispositionChangeListener
{
- private static final Logger _logger = LoggerFactory.getLogger(ExplicitAcceptDispositionChangeListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ExplicitAcceptDispositionChangeListener.class);
private final MessageInstance _entry;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
index 53ea265..bcfa205 100755
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.message.MessageInstanceConsumer;
class ImplicitAcceptDispositionChangeListener implements ServerSession.MessageDispositionChangeListener
{
- private static final Logger _logger = LoggerFactory.getLogger(ImplicitAcceptDispositionChangeListener.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ImplicitAcceptDispositionChangeListener.class);
private final MessageInstance _entry;
@@ -47,7 +47,7 @@ class ImplicitAcceptDispositionChangeListener implements ServerSession.MessageDi
@Override
public void onAccept()
{
- _logger.warn("MessageAccept received for message which is using NONE as the accept mode (likely client error)");
+ LOGGER.warn("MessageAccept received for message which is using NONE as the accept mode (likely client error)");
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7884dc92/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 29a591a..3e47616 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -112,7 +112,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
{
public static final int DEFAULT_PREFETCH = 4096;
- private static final Logger _logger = LoggerFactory.getLogger(AMQChannel.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AMQChannel.class);
private static final InfiniteCreditCreditManager INFINITE_CREDIT_CREDIT_MANAGER = new InfiniteCreditCreditManager();
private static final Function<MessageConsumerAssociation, MessageInstance>
MESSAGE_INSTANCE_FUNCTION = new Function<MessageConsumerAssociation, MessageInstance>()
@@ -327,9 +327,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
private void publishContentHeader(ContentHeaderBody contentHeaderBody)
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Content header received on channel " + _channelId);
+ LOGGER.debug("Content header received on channel " + _channelId);
}
_currentMessage.setContentHeaderBody(contentHeaderBody);
@@ -429,9 +429,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
boolean mandatory = amqMessage.isMandatory();
boolean closeOnNoRoute = _connection.isCloseWhenNoRoute();
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Unroutable message exchange='{}', routing key='{}', mandatory={},"
+ LOGGER.debug("Unroutable message exchange='{}', routing key='{}', mandatory={},"
+ " transactionalSession={}, closeOnNoRoute={}, confirmOnPublish={}",
exchangeName,
routingKey,
@@ -511,9 +511,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
private void publishContentBody(ContentBody contentBody)
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug(debugIdentity() + " content body received on channel " + _channelId);
+ LOGGER.debug(debugIdentity() + " content body received on channel " + _channelId);
}
try
@@ -716,9 +716,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
*/
private boolean unsubscribeConsumer(AMQShortString consumerTag)
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Unsubscribing consumer '{}' on channel {}", consumerTag, this);
+ LOGGER.debug("Unsubscribing consumer '{}' on channel {}", consumerTag, this);
}
ConsumerTarget_0_8 target = _tag2SubscriptionTargetMap.remove(consumerTag);
@@ -729,7 +729,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
}
else
{
- _logger.warn("Attempt to unsubscribe consumer with tag '" + consumerTag + "' which is not registered.");
+ LOGGER.warn("Attempt to unsubscribe consumer with tag '" + consumerTag + "' which is not registered.");
}
return false;
}
@@ -787,15 +787,15 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
private void unsubscribeAllConsumers()
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
if (!_tag2SubscriptionTargetMap.isEmpty())
{
- _logger.debug("Unsubscribing all consumers on channel " + toString());
+ LOGGER.debug("Unsubscribing all consumers on channel " + toString());
}
else
{
- _logger.debug("No consumers to unsubscribe on channel " + toString());
+ LOGGER.debug("No consumers to unsubscribe on channel " + toString());
}
}
@@ -819,9 +819,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
MessageInstanceConsumer consumer,
final boolean usesCredit)
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug(debugIdentity() + " Adding unacked message(" + entry.getMessage().toString() + " DT:" + deliveryTag
+ LOGGER.debug(debugIdentity() + " Adding unacked message(" + entry.getMessage().toString() + " DT:" + deliveryTag
+ ") for " + consumer + " on " + entry.getOwningResource().getName());
}
@@ -862,9 +862,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
if (!copy.isEmpty())
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Requeuing {} unacked messages", copy.size());
+ LOGGER.debug("Requeuing {} unacked messages", copy.size());
}
}
@@ -904,7 +904,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
}
else
{
- _logger.warn("Requested requeue of message: {} but no such delivery tag exists.", deliveryTag);
+ LOGGER.warn("Requested requeue of message: {} but no such delivery tag exists.", deliveryTag);
}
}
@@ -943,9 +943,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final Map<Long, MessageConsumerAssociation> msgToRequeue = new LinkedHashMap<>();
final Map<Long, MessageConsumerAssociation> msgToResend = new LinkedHashMap<>();
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Unacknowledged messages: {}", _unacknowledgedMessageMap.size());
+ LOGGER.debug("Unacknowledged messages: {}", _unacknowledgedMessageMap.size());
}
_unacknowledgedMessageMap.visit(new Visitor()
@@ -1538,7 +1538,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
if (association == null)
{
- _logger.warn("No message found, unable to DLQ delivery tag: " + deliveryTag);
+ LOGGER.warn("No message found, unable to DLQ delivery tag: " + deliveryTag);
}
else
{
@@ -1596,9 +1596,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
private void sync()
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("sync() called on channel " + debugIdentity());
+ LOGGER.debug("sync() called on channel " + debugIdentity());
}
AsyncCommand cmd;
@@ -1700,9 +1700,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final boolean passive,
final boolean active, final boolean write, final boolean read)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] AccessRequest[" +" realm: " + realm +
+ LOGGER.debug("RECV[" + _channelId + "] AccessRequest[" +" realm: " + realm +
" exclusive: " + exclusive +
" passive: " + passive +
" active: " + active +
@@ -1730,9 +1730,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveBasicAck(final long deliveryTag, final boolean multiple)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicAck[" +" deliveryTag: " + deliveryTag + " multiple: " + multiple + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] BasicAck[" +" deliveryTag: " + deliveryTag + " multiple: " + multiple + " ]");
}
Collection<MessageConsumerAssociation> ackedMessages = _unacknowledgedMessageMap.acknowledge(deliveryTag, multiple);
@@ -1744,9 +1744,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
public void receiveBasicCancel(final AMQShortString consumerTag, final boolean nowait)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicCancel[" +" consumerTag: " + consumerTag + " noWait: " + nowait + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] BasicCancel[" +" consumerTag: " + consumerTag + " noWait: " + nowait + " ]");
}
unsubscribeConsumer(consumerTag);
@@ -1767,9 +1767,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final boolean exclusive, final boolean nowait, final FieldTable arguments)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicConsume[" +" queue: " + queue +
+ LOGGER.debug("RECV[" + _channelId + "] BasicConsume[" +" queue: " + queue +
" consumerTag: " + consumerTag +
" noLocal: " + noLocal +
" noAck: " + noAck +
@@ -1814,9 +1814,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
if (sources.isEmpty())
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("No queue for '" + queueName + "'");
+ LOGGER.debug("No queue for '" + queueName + "'");
}
if (queueName != null)
{
@@ -1903,9 +1903,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveBasicGet(final AMQShortString queueName, final boolean noAck)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicGet[" +" queue: " + queueName + " noAck: " + noAck + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] BasicGet[" +" queue: " + queueName + " noAck: " + noAck + " ]");
}
NamedAddressSpace vHost = _connection.getAddressSpace();
@@ -1913,9 +1913,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
MessageSource queue = queueName == null ? getDefaultQueue() : vHost.getAttainedMessageSource(queueName.toString());
if (queue == null)
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("No queue for '" + queueName + "'");
+ LOGGER.debug("No queue for '" + queueName + "'");
}
if (queueName != null)
{
@@ -1975,9 +1975,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final boolean mandatory,
final boolean immediate)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicPublish[" +" exchange: " + exchangeName +
+ LOGGER.debug("RECV[" + _channelId + "] BasicPublish[" +" exchange: " + exchangeName +
" routingKey: " + routingKey +
" mandatory: " + mandatory +
" immediate: " + immediate + " ]");
@@ -2041,9 +2041,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveBasicQos(final long prefetchSize, final int prefetchCount, final boolean global)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicQos[" +" prefetchSize: " + prefetchSize + " prefetchCount: " + prefetchCount + " global: " + global + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] BasicQos[" +" prefetchSize: " + prefetchSize + " prefetchCount: " + prefetchCount + " global: " + global + " ]");
}
sync();
@@ -2058,9 +2058,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveBasicRecover(final boolean requeue, final boolean sync)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicRecover[" + " requeue: " + requeue + " sync: " + sync + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] BasicRecover[" + " requeue: " + requeue + " sync: " + sync + " ]");
}
if (requeue)
@@ -2086,30 +2086,30 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveBasicReject(final long deliveryTag, final boolean requeue)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicReject[" +" deliveryTag: " + deliveryTag + " requeue: " + requeue + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] BasicReject[" +" deliveryTag: " + deliveryTag + " requeue: " + requeue + " ]");
}
MessageInstance message = getUnacknowledgedMessageMap().get(deliveryTag);
if (message == null)
{
- _logger.warn("Dropping reject request as message is null for tag:" + deliveryTag);
+ LOGGER.warn("Dropping reject request as message is null for tag:" + deliveryTag);
}
else
{
if (message.getMessage() == null)
{
- _logger.warn("Message has already been purged, unable to Reject.");
+ LOGGER.warn("Message has already been purged, unable to Reject.");
}
else
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Rejecting: DT:" + deliveryTag
+ LOGGER.debug("Rejecting: DT:" + deliveryTag
+ "-" + message.getMessage() +
": Requeue:" + requeue
+
@@ -2129,9 +2129,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
// message.reject();
final boolean maxDeliveryCountEnabled = isMaxDeliveryCountEnabled(deliveryTag);
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("maxDeliveryCountEnabled: "
+ LOGGER.debug("maxDeliveryCountEnabled: "
+ maxDeliveryCountEnabled
+ " deliveryTag "
+ deliveryTag);
@@ -2139,9 +2139,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
if (maxDeliveryCountEnabled)
{
final boolean deliveredTooManyTimes = isDeliveredTooManyTimes(deliveryTag);
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("deliveredTooManyTimes: "
+ LOGGER.debug("deliveredTooManyTimes: "
+ deliveredTooManyTimes
+ " deliveryTag "
+ deliveryTag);
@@ -2174,9 +2174,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final int classId,
final int methodId)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ChannelClose[" +" replyCode: " + replyCode + " replyText: " + replyText + " classId: " + classId + " methodId: " + methodId + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] ChannelClose[" +" replyCode: " + replyCode + " replyText: " + replyText + " classId: " + classId + " methodId: " + methodId + " ]");
}
@@ -2190,9 +2190,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveChannelCloseOk()
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ChannelCloseOk");
+ LOGGER.debug("RECV[" + _channelId + "] ChannelCloseOk");
}
_connection.closeChannelOk(getChannelId());
@@ -2201,9 +2201,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveMessageContent(final QpidByteBuffer data)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] MessageContent[" +" data: " + hex(data,_connection.getBinaryDataLimit()) + " ] ");
+ LOGGER.debug("RECV[" + _channelId + "] MessageContent[" +" data: " + hex(data,_connection.getBinaryDataLimit()) + " ] ");
}
if(hasCurrentMessage())
@@ -2221,9 +2221,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveMessageHeader(final BasicContentHeaderProperties properties, final long bodySize)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] MessageHeader[ properties: {" + properties + "} bodySize: " + bodySize + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] MessageHeader[ properties: {" + properties + "} bodySize: " + bodySize + " ]");
}
if(hasCurrentMessage())
@@ -2254,9 +2254,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveBasicNack(final long deliveryTag, final boolean multiple, final boolean requeue)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] BasicNack[" +" deliveryTag: " + deliveryTag + " multiple: " + multiple + " requeue: " + requeue + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] BasicNack[" +" deliveryTag: " + deliveryTag + " multiple: " + multiple + " requeue: " + requeue + " ]");
}
Map<Long, MessageConsumerAssociation> nackedMessageMap = new LinkedHashMap<>();
@@ -2267,20 +2267,20 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
if (unackedMessageConsumerAssociation == null)
{
- _logger.warn("Ignoring nack request as message is null for tag:" + deliveryTag);
+ LOGGER.warn("Ignoring nack request as message is null for tag:" + deliveryTag);
}
else
{
MessageInstance message = unackedMessageConsumerAssociation.getMessageInstance();
if (message.getMessage() == null)
{
- _logger.warn("Message has already been purged, unable to nack.");
+ LOGGER.warn("Message has already been purged, unable to nack.");
}
else
{
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Nack-ing: DT:" + deliveryTag
+ LOGGER.debug("Nack-ing: DT:" + deliveryTag
+ "-" + message.getMessage() +
": Requeue:" + requeue
+
@@ -2298,9 +2298,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
message.reject(unackedMessageConsumerAssociation.getConsumer());
final boolean maxDeliveryCountEnabled = isMaxDeliveryCountEnabled(deliveryTag);
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("maxDeliveryCountEnabled: "
+ LOGGER.debug("maxDeliveryCountEnabled: "
+ maxDeliveryCountEnabled
+ " deliveryTag "
+ deliveryTag);
@@ -2308,9 +2308,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
if (maxDeliveryCountEnabled)
{
final boolean deliveredTooManyTimes = isDeliveredTooManyTimes(deliveryTag);
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("deliveredTooManyTimes: "
+ LOGGER.debug("deliveredTooManyTimes: "
+ deliveredTooManyTimes
+ " deliveryTag "
+ deliveryTag);
@@ -2340,9 +2340,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveChannelFlow(final boolean active)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ChannelFlow[" +" active: " + active + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] ChannelFlow[" +" active: " + active + " ]");
}
@@ -2365,9 +2365,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveChannelFlowOk(final boolean active)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ChannelFlowOk[" +" active: " + active + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] ChannelFlowOk[" +" active: " + active + " ]");
}
// TODO - should we do anything here?
@@ -2378,9 +2378,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final AMQShortString routingKey,
final AMQShortString queueName)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ExchangeBound[" +" exchange: " + exchangeName + " routingKey: " +
+ LOGGER.debug("RECV[" + _channelId + "] ExchangeBound[" +" exchange: " + exchangeName + " routingKey: " +
routingKey + " queue: " + queueName + " ]");
}
@@ -2559,9 +2559,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final boolean nowait,
final FieldTable arguments)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ExchangeDeclare[" +" exchange: " + exchangeName +
+ LOGGER.debug("RECV[" + _channelId + "] ExchangeDeclare[" +" exchange: " + exchangeName +
" type: " + type +
" passive: " + passive +
" durable: " + durable +
@@ -2736,9 +2736,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveExchangeDelete(final AMQShortString exchangeStr, final boolean ifUnused, final boolean nowait)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ExchangeDelete[" +" exchange: " + exchangeStr + " ifUnused: " + ifUnused + " nowait: " + nowait + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] ExchangeDelete[" +" exchange: " + exchangeStr + " ifUnused: " + ifUnused + " nowait: " + nowait + " ]");
}
@@ -2805,9 +2805,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final boolean nowait,
final FieldTable argumentsTable)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] QueueBind[" +" queue: " + queueName +
+ LOGGER.debug("RECV[" + _channelId + "] QueueBind[" +" queue: " + queueName +
" exchange: " + exchange +
" bindingKey: " + bindingKey +
" nowait: " + nowait + " arguments: " + argumentsTable + " ]");
@@ -2877,9 +2877,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
}
}
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Binding queue "
+ LOGGER.debug("Binding queue "
+ queue
+ " to exchange "
+ exch
@@ -2912,9 +2912,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final boolean nowait,
final FieldTable arguments)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] QueueDeclare[" +" queue: " + queueStr +
+ LOGGER.debug("RECV[" + _channelId + "] QueueDeclare[" +" queue: " + queueStr +
" passive: " + passive +
" durable: " + durable +
" exclusive: " + exclusive +
@@ -2974,9 +2974,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
queue.getConsumerCount());
_connection.writeFrame(responseBody.generateFrame(getChannelId()));
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Queue " + queueName + " declared successfully");
+ LOGGER.debug("Queue " + queueName + " declared successfully");
}
}
}
@@ -3040,9 +3040,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
queue.getConsumerCount());
_connection.writeFrame(responseBody.generateFrame(getChannelId()));
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Queue " + queueName + " declared successfully");
+ LOGGER.debug("Queue " + queueName + " declared successfully");
}
}
}
@@ -3099,9 +3099,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
queue.getConsumerCount());
_connection.writeFrame(responseBody.generateFrame(getChannelId()));
- if (_logger.isDebugEnabled())
+ if (LOGGER.isDebugEnabled())
{
- _logger.debug("Queue " + queueName + " declared successfully");
+ LOGGER.debug("Queue " + queueName + " declared successfully");
}
}
}
@@ -3120,9 +3120,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final boolean ifEmpty,
final boolean nowait)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] QueueDelete[" +" queue: " + queueName + " ifUnused: " + ifUnused + " ifEmpty: " + ifEmpty + " nowait: " + nowait + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] QueueDelete[" +" queue: " + queueName + " ifUnused: " + ifUnused + " ifEmpty: " + ifEmpty + " nowait: " + nowait + " ]");
}
NamedAddressSpace virtualHost = _connection.getAddressSpace();
@@ -3190,9 +3190,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveQueuePurge(final AMQShortString queueName, final boolean nowait)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] QueuePurge[" +" queue: " + queueName + " nowait: " + nowait + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] QueuePurge[" +" queue: " + queueName + " nowait: " + nowait + " ]");
}
NamedAddressSpace virtualHost = _connection.getAddressSpace();
@@ -3240,9 +3240,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
final AMQShortString bindingKey,
final FieldTable arguments)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] QueueUnbind[" +" queue: " + queueName +
+ LOGGER.debug("RECV[" + _channelId + "] QueueUnbind[" +" queue: " + queueName +
" exchange: " + exchange +
" bindingKey: " + bindingKey +
" arguments: " + arguments + " ]");
@@ -3306,9 +3306,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveTxSelect()
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] TxSelect");
+ LOGGER.debug("RECV[" + _channelId + "] TxSelect");
}
setLocalTransactional();
@@ -3322,9 +3322,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveTxCommit()
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] TxCommit");
+ LOGGER.debug("RECV[" + _channelId + "] TxCommit");
}
@@ -3351,9 +3351,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveTxRollback()
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] TxRollback");
+ LOGGER.debug("RECV[" + _channelId + "] TxRollback");
}
if (!isTransactional())
@@ -3384,9 +3384,9 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
@Override
public void receiveConfirmSelect(final boolean nowait)
{
- if(_logger.isDebugEnabled())
+ if(LOGGER.isDebugEnabled())
{
- _logger.debug("RECV[" + _channelId + "] ConfirmSelect [ nowait: " + nowait + " ]");
+ LOGGER.debug("RECV[" + _channelId + "] ConfirmSelect [ nowait: " + nowait + " ]");
}
_confirmOnPublish = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org