Author: ningjiang
Date: Tue Dec 23 00:06:49 2008
New Revision: 728900
URL: http://svn.apache.org/viewvc?rev=728900&view=rev
Log:
CAMEL-959 don't let transactedInOut bother JMSConsumer
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=728900&r1=728899&r2=728900&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Tue Dec 23 00:06:49 2008
@@ -880,8 +880,8 @@
container.setAcceptMessagesWhileStopping(acceptMessagesWhileStopping);
container.setExposeListenerSession(exposeListenerSession);
- container.setSessionTransacted(transacted && transactedInOut);
- if (transacted && transactedInOut) {
+ container.setSessionTransacted(transacted);
+ if (transacted) {
container.setSessionAcknowledgeMode(Session.SESSION_TRANSACTED);
} else {
if (acknowledgementMode >= 0) {
@@ -930,9 +930,9 @@
listenerContainer.setTaskExecutor(taskExecutor);
}
PlatformTransactionManager tm = getTransactionManager();
- if (tm != null && (transacted && transactedInOut)) {
+ if (tm != null && transacted) {
listenerContainer.setTransactionManager(tm);
- } else if (transacted && transactedInOut) {
+ } else if (transacted) {
throw new IllegalArgumentException("Property transacted is
enabled but a transactionManager was not injected!");
}
if (transactionName != null) {
Modified:
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml?rev=728900&r1=728899&r2=728900&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/nonTxInOutJmsTest.xml
Tue Dec 23 00:06:49 2008
@@ -14,7 +14,7 @@
<bean id="jmsConfig"
class="org.apache.camel.component.jms.JmsConfiguration">
<property name="connectionFactory" ref="jmsConnectionFactory"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
- <property name="transacted" value="true"/>
+ <property name="transacted" value="false"/>
<property name="transactedInOut" value="false" />
</bean>
