Added checks for null/blank sysName before updating node label with the

sysName value. Fixes bug NMS-2580.
OpenNMS · Nov 26, 2014 · 74ffe56 · 74ffe56
1 parent 80b686d
commit 74ffe56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...rovisiond/src/main/java/org/opennms/netmgt/provision/service/operations/ScanResource.java b/...rovisiond/src/main/java/org/opennms/netmgt/provision/service/operations/ScanResource.java
@@ -101,11 +101,15 @@ public void setAttribute(String key, String value) {
                 m_node.setSysObjectId(value);
             } else if (key.equals("sysName")) {
                 m_node.setSysName(value);
-                // If the node is labeled as just the IP address from the newSuspect that created it,
-                // use the SNMP sysName value instead and update the label source to indicate this
-                if (m_node.getLabelSource() == NodeLabelSource.ADDRESS) {
-                    m_node.setLabel(value);
-                    m_node.setLabelSource(NodeLabelSource.SYSNAME);
+
+                // If the sysName isn't null or empty...
+                if (value != null && !"".equals(value.trim())) {
+                    // If the node is labeled as just the IP address from the newSuspect that created it,
+                    // use the SNMP sysName value instead and update the label source to indicate this
+                    if (m_node.getLabelSource() == NodeLabelSource.ADDRESS) {
+                        m_node.setLabel(value);
+                        m_node.setLabelSource(NodeLabelSource.SYSNAME);
+                    }
                 }
             }
 

diff --git a/opennms-services/src/main/java/org/opennms/netmgt/capsd/SuspectEventProcessor.java b/opennms-services/src/main/java/org/opennms/netmgt/capsd/SuspectEventProcessor.java
@@ -378,7 +378,7 @@ private DbNodeEntry createNode(Connection dbc, InetAddress ifaddr,
                 String str = sysgrp.getSysName();
                 LOG.debug("SuspectEventProcessor: {} has sysName: {}", str(ifaddr), str);
 
-                if (str != null && str.length() > 0) {
+                if (str != null && !"".equals(str.trim())) {
                     entryNode.setSystemName(str);
 
                     // Hostname takes precedence over sysName so only replace