This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new a1f15f4 AMQ-6905 : Upgraded ActivationConfigProperty as per API
Documentation
new f5b1800 Merge pull request #278 from asutosh936/AMQ-6905
a1f15f4 is described below
commit a1f15f45111aacdde2ff883116d32aa8c14e4adc
Author: asutosh936 <[email protected]>
AuthorDate: Sat Mar 3 13:18:39 2018 -0600
AMQ-6905 : Upgraded ActivationConfigProperty as per API Documentation
---
.../src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index b17674e..cf0be3e 100644
---
a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++
b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -129,7 +129,7 @@ public class ActiveMQResourceAdapter extends
ActiveMQConnectionSupport implement
}
String userName = defaultValue(activationSpec.getUserName(),
getInfo().getUserName());
String password = defaultValue(activationSpec.getPassword(),
getInfo().getPassword());
- String clientId = activationSpec.getClientId();
+ String clientId = defaultValue(activationSpec.getClientId(),
getInfo().getClientid());
if (clientId != null) {
cf.setClientID(clientId);
} else {
