mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-06 19:22:07 +01:00
Code Issues Projects Releases Wiki Activity

Fixed an NPE in device manager/provider.

Browse Source 
Change-Id: I0240bc6f591881efefc1043eb620068d6ab2d9a4
This commit is contained in:
Thomas Vachuska 2015-10-13 11:56:59 -07:00 committed by Gerrit Code Review
parent 40e63e66f1
commit fa8aa2f188
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View File

@ -18,6 +18,7 @@ package org.onosproject.net.device.impl;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
import static org.onlab.util.Tools.groupedThreads; 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.MASTER;
import static org.onosproject.net.MastershipRole.NONE; import static org.onosproject.net.MastershipRole.NONE;
import static org.onosproject.net.MastershipRole.STANDBY; import static org.onosproject.net.MastershipRole.STANDBY;
@ -435,7 +436,7 @@ public class DeviceManager
portDescription); portDescription);
return; return;
} }
final Device device = getDevice(deviceId); Device device = nullIsNotFound(getDevice(deviceId), "Device not found");
if ((Device.Type.ROADM.equals(device.type()))) { if ((Device.Type.ROADM.equals(device.type()))) {
Port port = getPort(deviceId, portDescription.portNumber()); Port port = getPort(deviceId, portDescription.portNumber());
portDescription = OpticalPortOperator.descriptionOf(port, portDescription.isEnabled()); portDescription = OpticalPortOperator.descriptionOf(port, portDescription.isEnabled());

1
providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
View File

@ -377,7 +377,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
public void receivedRoleReply(Dpid dpid, RoleState requested, RoleState response) { public void receivedRoleReply(Dpid dpid, RoleState requested, RoleState response) {
MastershipRole request = roleOf(requested); MastershipRole request = roleOf(requested);
MastershipRole reply = roleOf(response); MastershipRole reply = roleOf(response);
providerService.receivedRoleReply(deviceId(uri(dpid)), request, reply); providerService.receivedRoleReply(deviceId(uri(dpid)), request, reply);
} }