svn commit: r1202281 - in /camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms: CamelJmsTestHelper.java JmsSelectorInTest.java

[janstey]

Author: janstey
Date: Tue Nov 15 16:25:08 2011
New Revision: 1202281

URL: http://svn.apache.org/viewvc?rev=1202281&view=rev
Log:
enable sync send by default for non-persistent messages

Modified:
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
    
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java?rev=1202281&r1=1202280&r2=1202281&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
 Tue Nov 15 16:25:08 2011
@@ -50,7 +50,12 @@ public final class CamelJmsTestHelper {
         connectionFactory.setCopyMessageOnSend(false);
         connectionFactory.setOptimizeAcknowledge(true);
         connectionFactory.setOptimizedMessageDispatch(true);
-        connectionFactory.setUseAsyncSend(true);
+
+        // When using asyncSend, producers will not be guaranteed to send in 
the order we 
+        // have in the tests (which may be confusing for queues) so we need 
this set to false.
+        // Another way of guaranteeing order is to use persistent messages or 
transactions.
+        connectionFactory.setUseAsyncSend(false);
+
         connectionFactory.setAlwaysSessionAsync(false);
         // use a pooled connection factory
         PooledConnectionFactory pooled = new 
PooledConnectionFactory(connectionFactory);

Modified: 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java?rev=1202281&r1=1202280&r2=1202281&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
 Tue Nov 15 16:25:08 2011
@@ -49,14 +49,6 @@ public class JmsSelectorInTest extends C
         CamelContext camelContext = super.createCamelContext();
 
         ConnectionFactory connectionFactory = 
CamelJmsTestHelper.createConnectionFactory();
-        
-        // When using asyncSend, the producers (calls to 
template.sendBodyAndHeader) will not 
-        // be guaranteed to be in the order we have in the test so we need 
this set to false.
-        // Another way of guaranteeing order is to use persistent messages or 
transactions.
-        if (connectionFactory instanceof PooledConnectionFactory) {
-            ActiveMQConnectionFactory amqConnectionFactory = 
(ActiveMQConnectionFactory) 
((PooledConnectionFactory)connectionFactory).getConnectionFactory();
-            amqConnectionFactory.setUseAsyncSend(false);            
-        }
         JmsComponent component = 
jmsComponentAutoAcknowledge(connectionFactory);
         camelContext.addComponent("activemq", component);
         return camelContext;
@@ -72,4 +64,4 @@ public class JmsSelectorInTest extends C
             }
         };
     }
-}
\ No newline at end of file
+}