From fa8aa2f1882d3a9a836db07d8e8ec1333101d93f Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Tue, 13 Oct 2015 11:56:59 -0700 Subject: [PATCH] Fixed an NPE in device manager/provider. Change-Id: I0240bc6f591881efefc1043eb620068d6ab2d9a4 --- .../java/org/onosproject/net/device/impl/DeviceManager.java | 3 ++- .../provider/of/device/impl/OpenFlowDeviceProvider.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java index e35dc0c575..9215d3a049 100644 --- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java +++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java @@ -18,6 +18,7 @@ package org.onosproject.net.device.impl; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static org.onlab.util.Tools.groupedThreads; +import static org.onlab.util.Tools.nullIsNotFound; import static org.onosproject.net.MastershipRole.MASTER; import static org.onosproject.net.MastershipRole.NONE; import static org.onosproject.net.MastershipRole.STANDBY; @@ -435,7 +436,7 @@ public class DeviceManager portDescription); return; } - final Device device = getDevice(deviceId); + Device device = nullIsNotFound(getDevice(deviceId), "Device not found"); if ((Device.Type.ROADM.equals(device.type()))) { Port port = getPort(deviceId, portDescription.portNumber()); portDescription = OpticalPortOperator.descriptionOf(port, portDescription.isEnabled()); diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java index 4fa961f81b..329df20b39 100644 --- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java +++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java @@ -377,7 +377,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr public void receivedRoleReply(Dpid dpid, RoleState requested, RoleState response) { MastershipRole request = roleOf(requested); MastershipRole reply = roleOf(response); - providerService.receivedRoleReply(deviceId(uri(dpid)), request, reply); }