You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/20 07:49:38 UTC
svn commit: r719184 - in /activemq/camel/trunk/components/camel-jms/src:
main/java/org/apache/camel/component/jms/JmsConfiguration.java
test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
Author: ningjiang
Date: Wed Nov 19 22:49:38 2008
New Revision: 719184
URL: http://svn.apache.org/viewvc?rev=719184&view=rev
Log:
CAMEL-959 fixed the test error of TransactedJmsRouteTest
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=719184&r1=719183&r2=719184&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Wed Nov 19 22:49:38 2008
@@ -48,7 +48,6 @@
import org.springframework.jms.support.converter.MessageConverter;
import org.springframework.jms.support.destination.DestinationResolver;
import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.Assert;
import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java?rev=719184&r1=719183&r2=719184&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java Wed Nov 19 22:49:38 2008
@@ -146,8 +146,9 @@
// inbound was not transacted.
JmsEndpoint endpoint = (JmsEndpoint)endpoint("activemq:queue:e");
endpoint.getConfiguration().setTransacted(false);
- endpoint.getConfiguration().setAcknowledgementMode(Session.AUTO_ACKNOWLEDGE);
- from(endpoint).policy(requried).policy(rollback).to("activemq:queue:mock.a", "mock:b");
+ endpoint.getConfiguration().setAcknowledgementMode(Session.AUTO_ACKNOWLEDGE);
+ // since the endpoint of activemq:queue:e is not managed by the TransactionManager, let's create a new transaction
+ from(endpoint).policy(requirenew).policy(rollback).to("activemq:queue:mock.a", "mock:b");
//
// Sets up 2 consumers on single topic, one being transacted the