diff options
| author |   Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-13 16:06:48 -0800 |
|---|---|---|
| committer | Ashlee Young <ashlee@wildernessvoice.com> | 2015-11-13 16:06:48 -0800 |
| commit | e5df26295703f2f8f5f9b9ee406407a5684b8122 (patch) | |
| tree | da0ea16b2fc02391c79a303b01e4904e04f4d511 /framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java | |
| parent | 89cd569db9dbccd5e9a41bb37a6d18cd7bacad19 (diff) | |
ONOS commit id 710293f3afa03540a1fd3be038da0ea6a488765c
Change-Id: I66c2370960d7597bdbaf7bf58defca3e864c4215
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java')
| -rw-r--r-- | framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java b/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java index fa90eb65..32403421 100644 --- a/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java +++ b/framework/src/onos/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java @@ -51,7 +51,7 @@ public final class BasicDeviceOperator implements ConfigOperator { * @return DeviceDescription based on both sources */ public static DeviceDescription combine(BasicDeviceConfig bdc, DeviceDescription descr) { - if (bdc == null) { + if (bdc == null || descr == null) { return descr; } |