commit | 78bcbc1227e65fcba618852650d3ac687fa2a938 | [log] [tgz] |
---|---|---|
author | Ayaka Koshibe <ayaka@onlab.us> | Wed Nov 19 14:28:58 2014 -0800 |
committer | Gerrit Code Review <gerrit@onlab.us> | Wed Nov 19 15:39:08 2014 -0800 |
tree | c2f85ed20809005e0a96aca60078ad83dd66c28f | |
parent | 4490a73af8bd25d2c05120f985b896a870ae8dc3 [diff] [blame] |
remove dependency on Devices for handling MastershipEvents Change-Id: Ie1670e77d3eee5dbd597f574ebe16d687e7b551e
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStore.java b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStore.java index 0c7fb0c..df6ed3c 100644 --- a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStore.java +++ b/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStore.java
@@ -235,7 +235,10 @@ DeviceId deviceId, List<PortDescription> portDescriptions) { Device device = devices.get(deviceId); - checkArgument(device != null, DEVICE_NOT_FOUND, deviceId); + if (device == null) { + log.debug("Device {} doesn't exist or hasn't been initialized yet", deviceId); + return Collections.emptyList(); + } Map<ProviderId, DeviceDescriptions> descsMap = deviceDescs.get(deviceId); checkArgument(descsMap != null, DEVICE_NOT_FOUND, deviceId);