Add an empty topology at initialization so we can never have a null topology
Change-Id: I07921583e107895aeeb627f7d61920fed800e77c
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DistributedTopologyStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DistributedTopologyStore.java
index 3878c79..cc42c88 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DistributedTopologyStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DistributedTopologyStore.java
@@ -17,6 +17,7 @@
import static org.slf4j.LoggerFactory.getLogger;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -26,11 +27,13 @@
import org.apache.felix.scr.annotations.Service;
import org.onlab.onos.event.Event;
import org.onlab.onos.net.ConnectPoint;
+import org.onlab.onos.net.Device;
import org.onlab.onos.net.DeviceId;
import org.onlab.onos.net.Link;
import org.onlab.onos.net.Path;
import org.onlab.onos.net.provider.ProviderId;
import org.onlab.onos.net.topology.ClusterId;
+import org.onlab.onos.net.topology.DefaultGraphDescription;
import org.onlab.onos.net.topology.GraphDescription;
import org.onlab.onos.net.topology.LinkWeight;
import org.onlab.onos.net.topology.Topology;
@@ -55,7 +58,11 @@
private final Logger log = getLogger(getClass());
- private volatile DefaultTopology current;
+ private volatile DefaultTopology current =
+ new DefaultTopology(ProviderId.NONE,
+ new DefaultGraphDescription(0L,
+ Collections.<Device>emptyList(),
+ Collections.<Link>emptyList()));
@Activate
public void activate() {