From e8586630265b881e7bd97e686c3541b2e7d42811 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Tue, 15 Feb 2011 22:05:44 -0500 Subject: [PATCH] NMS-3997 - check for nulls in provisiond --- .../provision/service/DefaultProvisionService.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultProvisionService.java b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultProvisionService.java index 8ffce09..13b067a 100644 --- a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultProvisionService.java +++ b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/DefaultProvisionService.java @@ -47,6 +47,7 @@ import java.util.Set; import org.joda.time.DateTime; import org.joda.time.Duration; +import org.opennms.core.utils.LogUtils; import org.opennms.core.utils.ThreadCategory; import org.opennms.netmgt.dao.CategoryDao; import org.opennms.netmgt.dao.DistPollerDao; @@ -822,8 +823,19 @@ public class DefaultProvisionService implements ProvisionService { /** {@inheritDoc} */ @Transactional - public OnmsIpInterface setIsPrimaryFlag(Integer nodeId, String ipAddress) { - OnmsIpInterface svcIface = m_ipInterfaceDao.findByNodeIdAndIpAddress(nodeId, ipAddress); + public OnmsIpInterface setIsPrimaryFlag(final Integer nodeId, final String ipAddress) { + if (nodeId == null) { + LogUtils.debugf(this, "nodeId is null!"); + return null; + } else if (ipAddress == null) { + LogUtils.debugf(this, "ipAddress is null!"); + return null; + } + final OnmsIpInterface svcIface = m_ipInterfaceDao.findByNodeIdAndIpAddress(nodeId, ipAddress); + if (svcIface == null) { + LogUtils.infof(this, "unable to find IPInterface for nodeId=%s, ipAddress=%s", nodeId.toString(), ipAddress); + return null; + } OnmsIpInterface primaryIface = null; if (svcIface.isPrimary()) { primaryIface = svcIface; -- 1.7.4.1