svn commit: r378226 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java

[jstrachan]

Author: jstrachan
Date: Thu Feb 16 03:21:38 2006
New Revision: 378226

URL: http://svn.apache.org/viewcvs?rev=378226&view=rev
Log:
avoid throwing exceptions to clients if a consumer has already been closed 
(maybe asynchronously)

Modified:
    
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java

Modified: 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java?rev=378226&r1=378225&r2=378226&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
 (original)
+++ 
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
 Thu Feb 16 03:21:38 2006
@@ -72,6 +72,7 @@
  */
 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 serviceLog = 
LogFactory.getLog(AbstractConnection.class.getName() + ".Service");
     
@@ -441,7 +442,6 @@
     }
     
     public Response processRemoveSession(SessionId id) throws Throwable {
-        
         ConnectionId connectionId = id.getParentId();
         
         ConnectionState cs = lookupConnectionState(connectionId);
@@ -451,10 +451,22 @@
         
         // Cascade the connection stop to the consumers and producers.
         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();) {
-            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);
         broker.removeSession(cs.getContext(), session.getInfo());