| commit | 4ef245e8ea98ca5e4832e82daa946f52e384085f | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Thu May 10 15:41:16 2018 -0700 |
| committer | Ray Milkey <ray@opennetworking.org> | Thu May 10 16:30:16 2018 -0700 |
| tree | 3f0a5fa407a475306fe794d841a6d7e9a580b799 | |
| parent | 056e0c144c9f81d40fb7eb1bc78a932b6012f5d2 [diff] |
Fix NPE in DeviceManager for an offline device Change-Id: Ib105b029efd0519c6ed54abf8e89c7be6c905987
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 caab65b..458d100 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
@@ -420,6 +420,12 @@ checkNotNull(deviceId, PORT_NUMBER_NULL); NodeId masterId = mastershipService.getMasterFor(deviceId); + if (masterId == null) { + // No master found; device is offline + log.info("No master found for port state change for {}", deviceId); + return; + } + if (!masterId.equals(localNodeId)) { //Send the request to the master node for the device log.info("Device {} is managed by {}, forwarding the request to the MASTER",