tom

Re-assembled the topology subsystem.

......@@ -36,6 +36,7 @@ public class SimpleHostStore {
// hosts sorted based on their location
private final Multimap<ConnectPoint, Host> locations = HashMultimap.create();
/**
* Creates a new host or updates the existing one based on the specified
* description.
......@@ -62,7 +63,7 @@ public class SimpleHostStore {
descr.vlan(),
descr.location(),
descr.ipAddresses());
synchronized(this) {
synchronized (this) {
hosts.put(hostId, newhost);
locations.put(descr.location(), newhost);
}
......@@ -104,7 +105,7 @@ public class SimpleHostStore {
* @return remove even or null if host was not found
*/
HostEvent removeHost(HostId hostId) {
synchronized(this) {
synchronized (this) {
Host host = hosts.remove(hostId);
if (host != null) {
locations.remove((host.location()), host);
......