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

Merge pull request #278 from asutosh936/AMQ-6905 

AMQ-6905 : Upgraded ActivationConfigProperty as per API Documentation
This commit is contained in:
Jean-Baptiste Onofré 2019-11-18 17:48:34 +01:00 committed by GitHub
parent dcb5ba1fb3 a1f15f4511
commit f5b1800b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
View File

@ -134,7 +134,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 {