summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-03-13 13:59:25 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-03-13 13:59:25 +0000
commit6591fd7807daa14dc710503cbfacaed4b96251fb (patch)
treef80e5ae5e84832cc3a5604abeec8bfab3dfa9547
parentcce433bcaac1d0ef5b1c1e545ffd26e51bac4891 (diff)
downloadqpid-python-6591fd7807daa14dc710503cbfacaed4b96251fb.tar.gz
QPID-1730 : Logging update highlighted that we were printing the queue before we had fully initialised it.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@753253 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java2
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java2
2 files changed, 2 insertions, 2 deletions
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 f5cc694e86..00dec57ed5 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
@@ -71,7 +71,7 @@ public class AMQPriorityQueue extends SimpleAMQQueue
@Override
public String getType()
{
- return getClass().getName() + "[" + getName() + "][Priorities:" + getPriorities() + "]";
+ return getClass().getSimpleName() + "[" + getName() + "][Priorities:" + getPriorities() + "]";
}
}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
index 5dd76a5299..d5271295dd 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueEntryList.java
@@ -237,7 +237,7 @@ public class PriorityQueueEntryList extends FlowableBaseQueueEntryList implement
for (int index = 0; index < _priorities; index++)
{
QueueEntryList queueEntryList = _priorityLists[index];
- _log.debug("Queue (" + _queue + ":" + _queue.getName() + ")[" + index + "] usage:" + queueEntryList.memoryUsed()
+ _log.debug("Queue (" + _queue.getName() + ")[" + index + "] usage:" + queueEntryList.memoryUsed()
+ "/" + queueEntryList.getMemoryUsageMaximum()
+ "/" + queueEntryList.dataSize());
}