commit 70d1e1c92412a920caaf17fdfdfbe94917e63326
author Andrea Campanella <andrea@opennetworking.org> Wed Mar 13 22:22:29 2019 -0700
committer Andrea Campanella <andrea@opennetworking.org> Fri Mar 15 05:38:13 2019 +0000
tree 428d645c67a7018a536ffb54f34f37b64c3d5679
parent bde9b39d449d2144bc51759a6e57b9038c987751

Fix for NPE in arista Drivers

Change-Id: I460ac6d39636972b39d55e9796efe9f9a5928de9

drivers/arista/src/main/java/org/onosproject/drivers/arista/DeviceDescriptionDiscoveryAristaImpl.java

diff --git a/drivers/arista/src/main/java/org/onosproject/drivers/arista/DeviceDescriptionDiscoveryAristaImpl.java b/drivers/arista/src/main/java/org/onosproject/drivers/arista/DeviceDescriptionDiscoveryAristaImpl.java
index bdc0e91..876ae01 100644
--- a/drivers/arista/src/main/java/org/onosproject/drivers/arista/DeviceDescriptionDiscoveryAristaImpl.java
+++ b/drivers/arista/src/main/java/org/onosproject/drivers/arista/DeviceDescriptionDiscoveryAristaImpl.java
@@ -95,8 +95,11 @@
 
             log.debug("systemMacAddress: {}", systemMacAddress);
 
+            SparseAnnotations annotations = device == null ?
+                    DefaultAnnotations.builder().build() : (SparseAnnotations) device.annotations();
+
             return new DefaultDeviceDescription(deviceId.uri(), Device.Type.SWITCH,
-                    MANUFACTURER, hwVer, swVer, serialNum, chassisId, (SparseAnnotations) device.annotations());
+                    MANUFACTURER, hwVer, swVer, serialNum, chassisId, annotations);
         } catch (Exception e) {
             log.error("Exception occurred because of {}, trace: {}", e, e.getStackTrace());
             return null;