svn commit: r948151 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java

[dkulp]

Author: dkulp
Date: Tue May 25 18:24:21 2010
New Revision: 948151

URL: http://svn.apache.org/viewvc?rev=948151&view=rev
Log:
Merged revisions 946960 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r946960 | ema | 2010-05-21 05:53:18 -0400 (Fri, 21 May 2010) | 1 line
  
  [CXF-2788]:Close all the connection when bus shutdown
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=948151&r1=948150&r2=948151&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 Tue May 25 18:24:21 2010
@@ -63,6 +63,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;
@@ -119,6 +120,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();
+            }
         }
     }