Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 78832 invoked from network); 21 May 2010 09:53:45 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 May 2010 09:53:45 -0000 Received: (qmail 35171 invoked by uid 500); 21 May 2010 09:53:45 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35059 invoked by uid 500); 21 May 2010 09:53:43 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 35051 invoked by uid 99); 21 May 2010 09:53:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 May 2010 09:53:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 21 May 2010 09:53:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 30DC923889E1; Fri, 21 May 2010 09:53:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r946960 - /cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java Date: Fri, 21 May 2010 09:53:19 -0000 To: commits@cxf.apache.org From: ema@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100521095319.30DC923889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ema Date: Fri May 21 09:53:18 2010 New Revision: 946960 URL: http://svn.apache.org/viewvc?rev=946960&view=rev Log: [CXF-2788]:Close all the connection when bus shutdown Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=946960&r1=946959&r2=946960&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java (original) +++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java Fri May 21 09:53:18 2010 @@ -59,6 +59,7 @@ import org.apache.cxf.transport.jms.cont import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.wsdl.EndpointReferenceUtils; import org.springframework.jms.connection.JmsResourceHolder; +import org.springframework.jms.connection.SingleConnectionFactory; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessageCreator; import org.springframework.jms.core.SessionCallback; @@ -115,6 +116,12 @@ public class JMSDestination extends Abst public void deactivate() { if (jmsListener != null) { jmsListener.shutdown(); + // CXF-2788: SingleConnectionFactory ignores the call to + // javax.jms.Connection#close(), + // use this to really close the target connection. + if (jmsListener.getConnectionFactory() instanceof SingleConnectionFactory) { + ((SingleConnectionFactory)jmsListener.getConnectionFactory()).destroy(); + } } }