Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 53423 invoked from network); 9 Mar 2011 17:02:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Mar 2011 17:02:19 -0000 Received: (qmail 46869 invoked by uid 500); 9 Mar 2011 17:02:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 46842 invoked by uid 500); 9 Mar 2011 17:02:19 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 46829 invoked by uid 99); 9 Mar 2011 17:02:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 17:02:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 17:02:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 75256238890D; Wed, 9 Mar 2011 17:01:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1079885 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker: MapTransportConnectionStateRegister.java TransportConnection.java Date: Wed, 09 Mar 2011 17:01:55 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110309170155.75256238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Wed Mar 9 17:01:55 2011 New Revision: 1079885 URL: http://svn.apache.org/viewvc?rev=1079885&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3198 - unregister failed add connection but have unregister respect the reference count such that it is only removed if the refcount is 1 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java?rev=1079885&r1=1079884&r2=1079885&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MapTransportConnectionStateRegister.java Wed Mar 9 17:01:55 2011 @@ -43,6 +43,10 @@ public class MapTransportConnectionState public TransportConnectionState unregisterConnectionState(ConnectionId connectionId) { TransportConnectionState rc = connectionStates.remove(connectionId); + if (rc.getReferenceCounter().get() > 1) { + rc.decrementReference(); + connectionStates.put(connectionId, rc); + } return rc; } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=1079885&r1=1079884&r2=1079885&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Wed Mar 9 17:01:55 2011 @@ -697,6 +697,7 @@ public class TransportConnection impleme synchronized (brokerConnectionStates) { brokerConnectionStates.remove(info.getConnectionId()); } + unregisterConnectionState(info.getConnectionId()); LOG.warn("Failed to add Connection " + info.getConnectionId() + ", reason: " + e.toString()); if (LOG.isDebugEnabled()) { LOG.debug("Exception detail:", e);