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/BasicDeviceOperator.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
index fa90eb6..3240342 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
@@ -51,7 +51,7 @@
      * @return DeviceDescription based on both sources
      */
     public static DeviceDescription combine(BasicDeviceConfig bdc, DeviceDescription descr) {
-        if (bdc == null) {
+        if (bdc == null || descr == null) {
             return descr;
         }