Author: chirino
Date: Mon Apr 10 13:29:23 2006
New Revision: 393048
URL: http://svn.apache.org/viewcvs?rev=393048&view=rev
Log:
test case for tempDest.delete() was failing. It could be that the advisory
topics were never created for a temp topic so its delete operation would fail.
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java?rev=393048&r1=393047&r2=393048&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
Mon Apr 10 13:29:23 2006
@@ -174,8 +174,14 @@
next.removeDestinationInfo(context, info);
ActiveMQTopic topic =
AdvisorySupport.getDestinationAdvisoryTopic(info.getDestination());
fireAdvisory(context, topic, info);
- next.removeDestination(context,
AdvisorySupport.getConsumerAdvisoryTopic(info.getDestination()), 0);
- next.removeDestination(context,
AdvisorySupport.getProducerAdvisoryTopic(info.getDestination()), 0);
+ try {
+ next.removeDestination(context,
AdvisorySupport.getConsumerAdvisoryTopic(info.getDestination()), 0);
+ } catch (Exception expectedIfDestinationDidNotExistYet) {
+ }
+ try {
+ next.removeDestination(context,
AdvisorySupport.getProducerAdvisoryTopic(info.getDestination()), 0);
+ } catch (Exception expectedIfDestinationDidNotExistYet) {
+ }
}
public void removeConnection(ConnectionContext context, ConnectionInfo
info, Throwable error) throws Exception {
