You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2020/07/16 12:27:28 UTC
[activemq] branch activemq-5.16.x updated (b3386c8 -> 6c07033)
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git.
from b3386c8 no jira - add selector on originalDestination attribute test
new 300d0b9 Change org.apache.activemq.jms.pool.XaPooledConnectionFactory#tmFromJndi parameter to Boolean for JCA validation
new 6c07033 AMQ-7516 - Fix XAConenctionPoolTest after change to make tmFromJndi an object
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/activemq/jms/pool/XaPooledConnectionFactory.java | 6 +++---
.../java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
[activemq] 01/02: Change
org.apache.activemq.jms.pool.XaPooledConnectionFactory#tmFromJndi parameter
to Boolean for JCA validation
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 300d0b9e83f41cfc9c0aefcb7362ea7ef6f29123
Author: Tomasz Adamski <ta...@redhat.com>
AuthorDate: Wed Jul 11 21:01:30 2018 +0200
Change org.apache.activemq.jms.pool.XaPooledConnectionFactory#tmFromJndi parameter to Boolean for JCA validation
---
.../org/apache/activemq/jms/pool/XaPooledConnectionFactory.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java
index a5d5aea..dd4f962 100644
--- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java
+++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/XaPooledConnectionFactory.java
@@ -43,7 +43,7 @@ public class XaPooledConnectionFactory extends PooledConnectionFactory implement
private static final long serialVersionUID = -6545688026350913005L;
private TransactionManager transactionManager;
- private boolean tmFromJndi = false;
+ private Boolean tmFromJndi = false;
private String tmJndiName = "java:/TransactionManager";
public TransactionManager getTransactionManager() {
@@ -129,7 +129,7 @@ public class XaPooledConnectionFactory extends PooledConnectionFactory implement
this.tmJndiName = tmJndiName;
}
- public boolean isTmFromJndi() {
+ public Boolean isTmFromJndi() {
return tmFromJndi;
}
@@ -138,7 +138,7 @@ public class XaPooledConnectionFactory extends PooledConnectionFactory implement
*
* @param tmFromJndi
*/
- public void setTmFromJndi(boolean tmFromJndi) {
+ public void setTmFromJndi(Boolean tmFromJndi) {
this.tmFromJndi = tmFromJndi;
}
}
[activemq] 02/02: AMQ-7516 - Fix XAConenctionPoolTest after change
to make tmFromJndi an object
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 6c07033c586e3f956a03b67f5e68953b54395cc8
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
AuthorDate: Thu Jul 16 08:18:01 2020 -0400
AMQ-7516 - Fix XAConenctionPoolTest after change to make tmFromJndi an
object
---
.../test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java
index d793759..a4ea122 100644
--- a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java
+++ b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java
@@ -322,8 +322,8 @@ public class XAConnectionPoolTest extends JmsPoolTestSupport {
public void testBindableEnvOverrides() throws Exception {
XaPooledConnectionFactory pcf = new XaPooledConnectionFactory();
assertTrue(pcf instanceof ObjectFactory);
- Hashtable<String, String> environment = new Hashtable<String, String>();
- environment.put("tmFromJndi", String.valueOf(Boolean.FALSE));
+ Hashtable<String, Object> environment = new Hashtable<>();
+ environment.put("tmFromJndi", Boolean.FALSE);
assertTrue(((ObjectFactory) pcf).getObjectInstance(null, null, null, environment) instanceof XaPooledConnectionFactory);
assertFalse(pcf.isTmFromJndi());
pcf.stop();