NMS-15717 : DeviceConfig via Minion fails if sshScript output contain…

…s control characters.(update code).
OpenNMS · Jan 15, 2025 · 7e740ee · 7e740ee
1 parent 2537b17
commit 7e740ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java b/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2023 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc.
+ * Copyright (C) 2025 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2025 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *
@@ -28,7 +28,6 @@
 
 package org.opennms.netmgt.poller;
 
-import org.eclipse.persistence.exceptions.XMLMarshalException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,12 +46,8 @@ public String unmarshal(String v) throws Exception {
             v = v.replace("&#xd;", "\r")
                     .replace("&#xa;", "\n");
         }
-        try {
             return v;
-        } catch (XMLMarshalException e) {
-            LOG.warn("Unable to unmarshal escape sequences value '{}' to a script output.  Returning null instead.", v);
-            return null;
-        }
+
     }
 
     @Override
@@ -61,11 +56,7 @@ public String marshal(String v) throws Exception {
             v = v.replace("\r", "&#xd;")
                     .replace("\n", "&#xa;");
         }
-        try {
             return v;
-        } catch (XMLMarshalException e) {
-            LOG.warn("Unable to marshal escape sequences value '{}' to a script output.  Returning null instead.", v);
-            return null;
-        }
+
     }
 }
diff --git a/features/poller/api/src/test/java/org/opennms/netmgt/poller/DeviceConfigTest.java b/features/poller/api/src/test/java/org/opennms/netmgt/poller/DeviceConfigTest.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2023 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc.
+ * Copyright (C) 2025 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2025 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *

diff --git a/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java b/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
  * This file is part of OpenNMS(R).
  *
- * Copyright (C) 2023 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc.
+ * Copyright (C) 2025 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2025 The OpenNMS Group, Inc.
  *
  * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
  *