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

[dkulp]

Author: dkulp
Date: Thu Oct 20 00:52:18 2011
New Revision: 1186590

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

........
  r1186456 | dkulp | 2011-10-19 16:27:49 -0400 (Wed, 19 Oct 2011) | 1 line
  
  Try finding the jms listiner via a property
........

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

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

Modified: 
cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=1186590&r1=1186589&r2=1186590&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 Thu Oct 20 00:52:18 2011
@@ -110,6 +110,11 @@ public class JMSDestination extends Abst
         org.apache.cxf.common.i18n.Message msg = 
             new 
org.apache.cxf.common.i18n.Message("INSUFFICIENT_CONFIGURATION_DESTINATION", 
LOG, name);
         jmsConfig.ensureProperlyConfigured(msg);
+        Object o = 
ei.getProperty(AbstractMessageListenerContainer.class.getName());
+        if (o instanceof AbstractMessageListenerContainer
+            && jmsConfig.getMessageListenerContainer() == null) {
+            
jmsConfig.setMessageListenerContainer((AbstractMessageListenerContainer)o);
+        }
         jmsListener = JMSFactory.createJmsListener(ei, jmsConfig, this, 
                                                    
jmsConfig.getTargetDestination());
     }