diff options
Diffstat (limited to 'qpid/java')
4 files changed, 20 insertions, 5 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index b6c741bbec..30af09ce4b 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -191,7 +191,7 @@ public abstract class AbstractExchange implements Exchange, Managable public String toString() { - return getClass().getName() + "[" + getName() +"]"; + return getClass().getSimpleName() + "[" + getName() +"]"; } public ManagedObject getManagedObject() diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java index e39c005750..e9af92bad8 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java @@ -168,16 +168,14 @@ public class DirectExchange extends AbstractExchange { if (_logger.isDebugEnabled()) { - _logger.debug("Queue (" + queue.getName() + ")" + queue + " is already registered with routing key " + routingKey); + _logger.debug("Queue (" + queue + ") is already registered with routing key " + routingKey); } } else { if (_logger.isDebugEnabled()) { - _logger.debug("Binding queue(" + queue.getName() + ") " + queue + " with routing key " + routingKey - + (args == null ? "" : " and arguments " + args.toString()) - + " to exchange " + this); + _logger.debug("Binding queue:" + queue + " with routing key '" + routingKey +"' to exchange:" + this); } } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java index ade780d0bb..f5cc694e86 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java @@ -68,4 +68,10 @@ public class AMQPriorityQueue extends SimpleAMQQueue } } + @Override + public String getType() + { + return getClass().getName() + "[" + getName() + "][Priorities:" + getPriorities() + "]"; + } + } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java index 63ec56c1af..ed9b1eb8d7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java @@ -1607,4 +1607,15 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener } return ids; } + + + public String getType() + { + return getClass().getSimpleName() + "[" + getName() +"]"; + } + + public String toString() + { + return getType() + "[Owner:" + _owner + "][Durable:" + _durable + "]"; + } } |