activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-1655 Fix TransportConfiguration encode failing
Date Fri, 02 Feb 2018 16:10:53 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 19147e498 -> 26a28d068


ARTEMIS-1655 Fix TransportConfiguration encode failing

Check for null on isMaskPassword, seems this regressed in bb84f679363f62e8b2663f63bf23f04133de481d
change for ARTEMIS-1600

Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9acdec24
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9acdec24
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9acdec24

Branch: refs/heads/master
Commit: 9acdec2468aa89cf6dfd99323f87c5c1a351bd0d
Parents: 19147e4
Author: Michael André Pearce <michael.andre.pearce@me.com>
Authored: Fri Feb 2 09:52:38 2018 +0000
Committer: Michael André Pearce <michael.andre.pearce@me.com>
Committed: Fri Feb 2 12:43:09 2018 +0000

----------------------------------------------------------------------
 .../artemis/core/deployers/impl/FileConfigurationParser.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9acdec24/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index 14b0025..8eee4dc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -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());


Mime
View raw message