Merge remote-tracking branch 'origin/foundation-2022' into foundation…

…-2023
OpenNMS · Jun 21, 2023 · 021d516 · 021d516
2 parents bb43a46 + ac098da
commit 021d516
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/jmx/api/src/main/java/org/opennms/netmgt/jmx/connection/JmxConnectionConfig.java b/core/jmx/api/src/main/java/org/opennms/netmgt/jmx/connection/JmxConnectionConfig.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
+ * Copyright (C) 2017-2023 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *
@@ -106,6 +106,9 @@ public PasswordStrategy getPasswordStategy() {
         if ("PASSWORD_CLEAR".equals(getFactory())) {
             return PasswordStrategy.PASSWORD_CLEAR;
         }
+        if ("PASSWORD-CLEAR".equals(getFactory())) {
+            return PasswordStrategy.PASSWORD_CLEAR;
+        }
         if ("SASL".equals(getFactory())) {
             return PasswordStrategy.SASL;
         }