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

ARTEMIS-1655 Fix TransportConfiguration encode failing 

Check for null on isMaskPassword, seems this regressed in bb84f67936 change for ARTEMIS-1600
This commit is contained in:
Michael André Pearce 2018-02-02 09:52:38 +00:00
parent 19147e4986
commit 9acdec2468
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
View File

@ -1159,7 +1159,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
Map<String, Object> params = configurations.get(0).getParams();
params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
if (mainConfig.isMaskPassword() != null) {
params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
}
if (mainConfig.getPasswordCodec() != null) {
params.put(ActiveMQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec());
@ -1180,7 +1182,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
Map<String, Object> params = configurations.get(0).getParams();
params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
if (mainConfig.isMaskPassword() != null) {
params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
}
if (mainConfig.getPasswordCodec() != null) {
params.put(ActiveMQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec());