commit 1d4b3aa8c16fbc33eb57fd8c18bd8ba94e256e4e
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Aug 09 15:10:18 2017 -0700
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Wed Aug 09 22:58:09 2017 +0000
tree b8d85bf251e173b9d8130b8c1c1063c251fb863e
parent d66228c5868452b0a316ec1ccb26e90593aed745

Bugfix: do not assume all Config is about DeviceId

- fix for ONOS-6900

Change-Id: I5d69a252900fefaab4512433b849d5c4333d37f8

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

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 7cad15b..d2b2536 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
@@ -987,10 +987,10 @@
         @Override
         public void event(NetworkConfigEvent event) {
             DeviceEvent de = null;
-            DeviceId did = (DeviceId) event.subject();
-            DeviceProvider dp = getProvider(did);
             if (event.configClass().equals(BasicDeviceConfig.class)) {
                 log.debug("Detected device network config event {}", event.type());
+                DeviceId did = (DeviceId) event.subject();
+                DeviceProvider dp = getProvider(did);
                 BasicDeviceConfig cfg =
                         networkConfigService.getConfig(did, BasicDeviceConfig.class);
 
@@ -1005,18 +1005,24 @@
                         de = store.createOrUpdateDevice(dp.id(), did, desc);
                     }
                 }
-            }
-            if (event.configClass().equals(PortDescriptionsConfig.class) && event.config().isPresent()
-                    && getDevice(did) != null && dp != null) {
+            } else if (event.configClass().equals(PortDescriptionsConfig.class)) {
+                DeviceId did = (DeviceId) event.subject();
+                DeviceProvider dp = getProvider(did);
+                if (!event.config().isPresent() ||
+                    getDevice(did) == null || dp == null) {
+                    // sanity check failed, ignore
+                    return;
+                }
                 PortDescriptionsConfig portConfig = (PortDescriptionsConfig) event.config().get();
-                    //updating the ports if configration exists
+                    //updating the ports if configuration exists
                     List<PortDescription> complete = store.getPortDescriptions(dp.id(), did)
                             .collect(Collectors.toList());
                     complete.addAll(portConfig.portDescriptions());
                     store.updatePorts(dp.id(), did, complete);
-            }
-            if (portOpsIndex.containsKey(event.configClass())) {
+            } else if (portOpsIndex.containsKey(event.configClass())) {
                 ConnectPoint cpt = (ConnectPoint) event.subject();
+                DeviceId did = cpt.deviceId();
+                DeviceProvider dp = getProvider(did);
 
                 // Note: assuming PortOperator can modify existing port,
                 //       but cannot add new port purely from Config.