diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-09-18 21:17:01 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-09-18 21:17:01 +0000 |
| commit | f532031f02b5f9b03ec40cd81a13e2df091a79f0 (patch) | |
| tree | 2c72dca8f5e86df346d110647c1a925ddf1e2c22 /java/broker/src/main | |
| parent | 22700415041aef90d033c0fb86b639741a47a6dd (diff) | |
| download | qpid-python-f532031f02b5f9b03ec40cd81a13e2df091a79f0.tar.gz | |
Remove old commented out conflict marker, erroneous println debugging statement. Correct exception message.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@998542 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/main')
3 files changed, 6 insertions, 12 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index 3aa9178d5d..d0231e4d80 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -91,14 +91,6 @@ public abstract class AbstractExchange implements Exchange, Managable private final AtomicLong _routedMessageSize = new AtomicLong(); private final CopyOnWriteArrayList<Exchange.BindingListener> _listeners = new CopyOnWriteArrayList<Exchange.BindingListener>(); -/* -======= - public ExchangeMBean() throws NotCompliantMBeanException - { - super(ManagedExchange.class, ManagedExchange.TYPE); - } ->>>>>>> .r902547 -*/ //TODO : persist creation time private long _createTime = System.currentTimeMillis(); diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java index 626ceb5d84..b33a83672b 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java +++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java @@ -137,7 +137,7 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends AMQQueue queue = vhost.getQueueRegistry().getQueue(new AMQShortString(queueName)); if (queue == null) { - throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange."); + throw new JMException("Queue \"" + queueName + "\" is not registered with the virtualhost."); } CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger())); @@ -164,7 +164,7 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends AMQQueue queue = vhost.getQueueRegistry().getQueue(new AMQShortString(queueName)); if (queue == null) { - throw new JMException("Queue \"" + queueName + "\" is not registered with the exchange."); + throw new JMException("Queue \"" + queueName + "\" is not registered with the virtualhost."); } CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger())); diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java index e98a603d12..f9cbfeb78b 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java +++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java @@ -251,8 +251,10 @@ public class HeadersExchange extends AbstractExchange bindings.remove(binding); } - _logger.debug("==============="); - _logger.debug("Removing Binding: " + _bindingHeaderMatchers.remove(new HeadersBinding(binding))); + if(_logger.isDebugEnabled()) + { + _logger.debug("Removing Binding: " + _bindingHeaderMatchers.remove(new HeadersBinding(binding))); + } } } |