Author: bvahdat
Date: Sat May 26 18:12:35 2012
New Revision: 1342940
URL: http://svn.apache.org/viewvc?rev=1342940&view=rev
Log:
CAMEL-5055: Polished.
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1342940&r1=1342939&r2=1342940&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Sat May 26 18:12:35 2012
@@ -984,12 +984,8 @@ public class JmsConfiguration implements
PlatformTransactionManager tm = getTransactionManager();
if (tm != null) {
container.setTransactionManager(tm);
- } else if (transacted && transactionManager == null) {
- if (!lazyCreateTransactionManager) {
- container.setSessionTransacted(true);
- } else {
- throw new IllegalArgumentException("Property transacted is
enabled but neither a transactionManager is available nor
lazyCreateTransactionManager is disabled!");
- }
+ } else if (transactionManager == null && transacted &&
!lazyCreateTransactionManager) {
+ container.setSessionTransacted(true);
}
if (transactionName != null) {
container.setTransactionName(transactionName);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=1342940&r1=1342939&r2=1342940&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
Sat May 26 18:12:35 2012
@@ -205,13 +205,15 @@ public class JmsEndpointConfigurationTes
public void testSessionTransacted() throws Exception {
JmsEndpoint endpoint =
resolveMandatoryEndpoint("jms:queue:Foo?transacted=true&lazyCreateTransactionManager=false",
JmsEndpoint.class);
AbstractMessageListenerContainer container =
endpoint.createConsumer(dummyProcessor).getListenerContainer();
- assertTrue(container.isSessionTransacted());
- assertFalse(endpoint.isLazyCreateTransactionManager());
+ assertTrue("The JMS sessions will not be transactional!",
container.isSessionTransacted());
+ assertFalse("The transactionManager gets lazily generated!",
endpoint.isLazyCreateTransactionManager());
+ assertNull("The endpoint has an injected TransactionManager!",
endpoint.getTransactionManager());
endpoint = resolveMandatoryEndpoint("jms:queue:Foo?transacted=true",
JmsEndpoint.class);
container =
endpoint.createConsumer(dummyProcessor).getListenerContainer();
- assertFalse(container.isSessionTransacted());
- assertTrue(endpoint.isLazyCreateTransactionManager());
+ assertFalse("The JMS sessions will be transactional!",
container.isSessionTransacted());
+ assertTrue("The transactionManager doesn't get lazily generated!",
endpoint.isLazyCreateTransactionManager());
+ assertNotNull("The endpoint has no injected TransactionManager!",
endpoint.getTransactionManager());
}
@Test
