commit 36f1df9c8da9e94de63c7ee5f3df983013786784
author Andrea Campanella <andrea@opennetworking.org> Mon Oct 01 14:54:01 2018 +0200
committer Ray Milkey <ray@opennetworking.org> Mon Oct 01 16:43:23 2018 +0000
tree 2cee262680715265f5349d7ab1a9138c2e02a7f4
parent 4e037f5c2fb01b7abc8d64e93a4b07dfa0ff0c86

Fixing NPE with null old description in NetconfDeviceProvider

Change-Id: Iece29a0a0ed3d2c72e64137e7e0dc1306e69f5eb

providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java

diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
index a0626df..9f1a6c4 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -677,10 +677,15 @@
     private class InternalDeviceListener implements DeviceListener {
         @Override
         public void event(DeviceEvent event) {
-            DeviceId deviceId = event.subject().id();
+            Device device = event.subject();
+            DeviceId deviceId = device.id();
             if (event.type() == DeviceEvent.Type.DEVICE_ADDED && !deviceService.isAvailable(event.subject().id())) {
                 try {
-                    checkAndUpdateDevice(deviceId, null, true);
+                    DeviceDescription description = new DefaultDeviceDescription(deviceId.uri(), device.type(),
+                            device.manufacturer(), device.hwVersion(), device.swVersion(),
+                            device.serialNumber(), device.chassisId(),
+                            (SparseAnnotations) device.annotations());
+                    checkAndUpdateDevice(deviceId, description, true);
                 } catch (Exception e) {
                     log.error("Unhandled exception checking {}", deviceId, e);
                 }