You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/09/18 23:17:03 UTC
svn commit: r998542 - in
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange:
AbstractExchange.java AbstractExchangeMBean.java HeadersExchange.java
Author: robbie
Date: Sat Sep 18 21:17:01 2010
New Revision: 998542
URL: http://svn.apache.org/viewvc?rev=998542&view=rev
Log:
Remove old commented out conflict marker, erroneous println debugging statement. Correct exception message.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=998542&r1=998541&r2=998542&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Sat Sep 18 21:17:01 2010
@@ -91,14 +91,6 @@ public abstract class AbstractExchange i
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();
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java?rev=998542&r1=998541&r2=998542&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java Sat Sep 18 21:17:01 2010
@@ -137,7 +137,7 @@ public abstract class AbstractExchangeMB
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 AbstractExchangeMB
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()));
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?rev=998542&r1=998541&r2=998542&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java Sat Sep 18 21:17:01 2010
@@ -251,8 +251,10 @@ public class HeadersExchange extends Abs
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)));
+ }
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org