Merge pull request #182 from gaohoward/Branch_2_2_AS7

Branch 2 2 as7
hornetq · May 15, 2012 · 7a2ce9d · 7a2ce9d
2 parents faaaa21 + cc132a5
commit 7a2ce9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/org/hornetq/core/config/Configuration.java b/src/main/org/hornetq/core/config/Configuration.java
@@ -900,12 +900,12 @@ public interface Configuration extends Serializable
    String getPasswordCodec();
 
    /**
-    * whehther default using cleartext password
+    * Sets if passwords should be masked or not. True means the passwords should be masked.
     */
    void setMaskPassword(boolean maskPassword);
 
    /**
-    * if using cleartext password by default
+    * Whether passwords are masked or not. True means the passwords are masked.
     */
    boolean isMaskPassword();
 }
diff --git a/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java b/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
@@ -903,12 +903,15 @@ private TransportConfiguration parseTransportConfiguration(final Element e, fina
       String clazz = XMLConfigurationUtil.getString(e, "factory-class", null, Validators.NOT_NULL_OR_EMPTY);
 
       Map<String, Object> params = new HashMap<String, Object>();
-
-      params.put(Configuration.PROP_MASK_PASSWORD, mainConfig.isMaskPassword());
 
-      if (mainConfig.getPasswordCodec() != null)
+      if (mainConfig.isMaskPassword())
       {
-         params.put(Configuration.PROP_PASSWORD_CODEC, mainConfig.getPasswordCodec());
+         params.put(Configuration.PROP_MASK_PASSWORD, mainConfig.isMaskPassword());
+
+         if (mainConfig.getPasswordCodec() != null)
+         {
+            params.put(Configuration.PROP_PASSWORD_CODEC, mainConfig.getPasswordCodec());
+         }
       }
 
       NodeList paramsNodes = e.getElementsByTagName("param");