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

[dkulp]

Author: dkulp
Date: Fri Feb 12 21:52:50 2010
New Revision: 909621

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

........
  r909605 | dkulp | 2010-02-12 16:13:00 -0500 (Fri, 12 Feb 2010) | 4 lines
  
  [CXF-2662] All JMSFactory to work better with an external
  MessageListenerContainer
  
  Patch from javier applied.
........

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/JMSFactory.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/JMSFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=909621&r1=909620&r2=909621&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
 Fri Feb 12 21:52:50 2010
@@ -129,6 +129,17 @@
                                                                     String 
destinationName, 
                                                                     String 
messageSelectorPrefix,
                                                                     boolean 
userCID) {
+        
+        if (jmsConfig.getMessageListenerContainer() != null) {
+            AbstractMessageListenerContainer  jmsListener =  
jmsConfig.getMessageListenerContainer();
+            if (jmsListener.getMessageListener() == null) {
+                jmsListener.setMessageListener(listenerHandler);
+                jmsListener.initialize();
+                jmsListener.start();
+            }
+            return jmsListener;
+        }
+        
         if (jmsConfig.getMessageListenerContainer() != null) {
             return jmsConfig.getMessageListenerContainer();
         }