commit a30877e1eb778f32d5f5201ab5c255bc9d97c195
author Andrea Campanella <andrea@opennetworking.org> Thu Nov 28 14:31:02 2019 +0100
committer Andrea Campanella <andrea@opennetworking.org> Fri Nov 29 17:06:15 2019 +0000
tree d2ffe52ecbd34efd889e289ac7a1b2a114c2d261
parent c6e94dd2f91d2ddb7de75f95c266943eb1776a93

Avoid propagating a null chassisID

Change-Id: I028008e45d1c78d149ef654047b9c1572eb05476
(cherry picked from commit f468858e9104e49e83c6294fdc4d17ce9456d7fd)

core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java

diff --git a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
index eb5f16a..d0b7b2b 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
@@ -110,6 +110,10 @@
         this.hwVersion = hwVersion;
         this.swVersion = swVersion;
         this.serialNumber = serialNumber;
+        //Avoid propagation of null chassisID and substitute it with UNKNOWN
+        if (chassis == null) {
+            chassis = new ChassisId();
+        }
         this.chassisId = chassis;
         this.defaultAvailable = defaultAvailable;
     }