Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add TM Locator impl to JMSBridge tests

This commit is contained in:
Martyn Taylor 2014-12-12 12:51:23 +00:00
parent 64cc435ea7
commit 39c61014ac
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-jms-server/src/main/java/org/apache/activemq/jms/bridge/impl/JMSBridgeImpl.java
View File

@ -402,7 +402,10 @@ public final class JMSBridgeImpl implements JMSBridge
checkParams();
TransactionManager tm = ServiceUtils.getTransactionManager();
if (tm == null)
{
tm = ServiceUtils.getTransactionManager();
}
// There may already be a JTA transaction associated to the thread
@ -1015,7 +1018,10 @@ public final class JMSBridgeImpl implements JMSBridge
ActiveMQJMSBridgeLogger.LOGGER.trace("Starting JTA transaction");
}
TransactionManager tm = ServiceUtils.getTransactionManager();
if (tm == null)
{
tm = ServiceUtils.getTransactionManager();
}
// Set timeout to a large value since we do not want to time out while waiting for messages
// to arrive - 10 years should be enough