svn commit: r748768 - in /cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms: JMSConduit.java JMSDestination.java JMSFactory.java

[dkulp]

Author: dkulp
Date: Sat Feb 28 01:37:21 2009
New Revision: 748768

URL: http://svn.apache.org/viewvc?rev=748768&view=rev
Log:
Allow selector to be used with user supplied cids

Modified:
    
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
    
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
    
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java

Modified: 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=748768&r1=748767&r2=748768&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
 (original)
+++ 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
 Sat Feb 28 01:37:21 2009
@@ -131,7 +131,7 @@
                 if (allListener == null) {
                     allListener = JMSFactory.createJmsListener(jmsConfig, 
                                                                this, 
-                                                               null, 
+                                                               
jmsConfig.getReplyDestination(), 
                                                                null, 
                                                                true);
                     addBusListener(exchange.get(Bus.class));

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=748768&r1=748767&r2=748768&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
 Sat Feb 28 01:37:21 2009
@@ -103,7 +103,7 @@
             new 
org.apache.cxf.common.i18n.Message("INSUFFICIENT_CONFIGURATION_DESTINATION", 
LOG, name);
         jmsConfig.ensureProperlyConfigured(msg);
         jmsListener = JMSFactory.createJmsListener(jmsConfig, this, 
-                                                   
jmsConfig.getTargetDestination(), null, true);
+                                                   
jmsConfig.getTargetDestination(), null, false);
     }
 
     public void deactivate() {

Modified: 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=748768&r1=748767&r2=748768&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
 (original)
+++ 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
 Sat Feb 28 01:37:21 2009
@@ -142,15 +142,13 @@
             jmsListener.setCacheLevel(jmsConfig.getCacheLevel());
         }
         String staticSelectorPrefix = jmsConfig.getConduitSelectorPrefix();
-        if (!userCID || jmsConfig.isSetUseConduitIdSelector()) {
-            if (messageSelectorPrefix != null && 
jmsConfig.isUseConduitIdSelector()) {
-                jmsListener.setMessageSelector("JMSCorrelationID LIKE '" 
-                                            + staticSelectorPrefix 
-                                            + messageSelectorPrefix + "%'");
-            } else if (staticSelectorPrefix.length() > 0) {
-                jmsListener.setMessageSelector("JMSCorrelationID LIKE '" 
-                                            + staticSelectorPrefix +  "%'");
-            }
+        if (!userCID && messageSelectorPrefix != null && 
jmsConfig.isUseConduitIdSelector()) {
+            jmsListener.setMessageSelector("JMSCorrelationID LIKE '" 
+                                        + staticSelectorPrefix 
+                                        + messageSelectorPrefix + "%'");
+        } else if (staticSelectorPrefix.length() > 0) {
+            jmsListener.setMessageSelector("JMSCorrelationID LIKE '" 
+                                        + staticSelectorPrefix +  "%'");
         }
         if (jmsConfig.getDestinationResolver() != null) {
             
jmsListener.setDestinationResolver(jmsConfig.getDestinationResolver());