commit 61946395d9e3457bab95c4d3bd44b33154aa478b
author Anurag Chadha <anurag.chadha@hsc.com> Fri Aug 28 15:18:03 2020 +0530
committer Thomas Vachuska <tom@opennetworking.org> Tue Sep 01 18:06:39 2020 +0000
tree c7cfc45ce16aeaab0c9a0daf8b463130c24b427b
parent 5de46cdd4fc9ac67f0cd800a4179b13b4c45e043

[ONOS-8115] Fix for NPE while adding annotations for device using netcfg

Change-Id: Ia30499b969a984e8580474a810a306f96b56879a

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 b114d0c..e40b14d 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
@@ -1144,7 +1144,9 @@
                 DeviceDescription desc =
                         (dev == null) ? null : BasicDeviceOperator.descriptionOf(dev);
                 Optional<Config> prevConfig = event.prevConfig();
-                desc = deviceAnnotationOp.combine(did, desc, prevConfig);
+                if (desc != null) { // Fix for NPE due to desc being null
+                    desc = deviceAnnotationOp.combine(did, desc, prevConfig);
+                }
                 if (desc != null && dp != null) {
                     store.createOrUpdateDevice(dp.id(), did, desc);
                 }