commit 1627dc8ed667722542166d7e5039799034494e4d
author Thomas Vachuska <tom@onlab.us> Fri Nov 13 12:22:14 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Nov 13 21:38:43 2015 +0000
tree e2ee0938587464b43e37958a9339d091285084ef
parent dbd49a0951b711a93a87f111d86118ba44dad6df

ONOS-3356 Fixed NPE when processing configuration of a non-existent device.

Change-Id: I00369a67c406634b2ee7d379cad6e0fc41842388

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 9215d3a..03281be 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
@@ -740,7 +740,7 @@
                     Device dev = getDevice(did);
                     DeviceDescription desc = (dev == null) ? null : BasicDeviceOperator.descriptionOf(dev);
                     desc = BasicDeviceOperator.combine(cfg, desc);
-                    if (getProvider(did) != null) {
+                    if (desc != null && getProvider(did) != null) {
                         de = store.createOrUpdateDevice(getProvider(did).id(), did, desc);
                     }
                 }
@@ -754,7 +754,7 @@
                     OpticalPortConfig opc = networkConfigService.getConfig(cpt, OpticalPortConfig.class);
                     PortDescription desc = OpticalPortOperator.descriptionOf(dpt);
                     desc = OpticalPortOperator.combine(opc, desc);
-                    if (getProvider(did) != null) {
+                    if (desc != null && getProvider(did) != null) {
                         de = store.updatePortStatus(getProvider(did).id(), did, desc);
                     }
                 }