Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid throwing exceptions to clients if a consumer has already been closed (maybe asynchronously) 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@378226 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2006-02-16 11:21:38 +00:00
parent 862c1f2138
commit e82d0fb470
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
View File

@ -72,6 +72,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
*/ */
public abstract class AbstractConnection implements Service, Connection, Task, CommandVisitor { public abstract class AbstractConnection implements Service, Connection, Task, CommandVisitor {
private static final Log log = LogFactory.getLog(AbstractConnection.class.getName());
private static final Log transportLog = LogFactory.getLog(AbstractConnection.class.getName() + ".Transport"); private static final Log transportLog = LogFactory.getLog(AbstractConnection.class.getName() + ".Transport");
private static final Log serviceLog = LogFactory.getLog(AbstractConnection.class.getName() + ".Service"); private static final Log serviceLog = LogFactory.getLog(AbstractConnection.class.getName() + ".Service");
@ -441,7 +442,6 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
} }
public Response processRemoveSession(SessionId id) throws Throwable { public Response processRemoveSession(SessionId id) throws Throwable {
ConnectionId connectionId = id.getParentId(); ConnectionId connectionId = id.getParentId();
ConnectionState cs = lookupConnectionState(connectionId); ConnectionState cs = lookupConnectionState(connectionId);
@ -451,10 +451,22 @@ public abstract class AbstractConnection implements Service, Connection, Task, C
// Cascade the connection stop to the consumers and producers. // Cascade the connection stop to the consumers and producers.
for (Iterator iter = session.getConsumerIds().iterator(); iter.hasNext();) { for (Iterator iter = session.getConsumerIds().iterator(); iter.hasNext();) {
processRemoveConsumer((ConsumerId) iter.next()); ConsumerId consumerId = (ConsumerId) iter.next();
try {
processRemoveConsumer(consumerId);
}
catch (Throwable e) {
log.warn("Failed to remove consumer: " + consumerId + ". Reason: " + e, e);
}
} }
for (Iterator iter = session.getProducerIds().iterator(); iter.hasNext();) { for (Iterator iter = session.getProducerIds().iterator(); iter.hasNext();) {
processRemoveProducer((ProducerId) iter.next()); ProducerId producerId = (ProducerId) iter.next();
try {
processRemoveProducer(producerId);
}
catch (Throwable e) {
log.warn("Failed to remove producer: " + producerId + ". Reason: " + e, e);
}
} }
cs.removeSession(id); cs.removeSession(id);
broker.removeSession(cs.getContext(), session.getInfo()); broker.removeSession(cs.getContext(), session.getInfo());