Commit b16aca8c authored by Christoph Storm's avatar Christoph Storm
Browse files

DefaultTopology Fix by Nils,

removed previous 'fix' to AbstractTopology
parent 8f97b2ee
...@@ -511,7 +511,7 @@ public class DefaultTopologyComponent implements TopologyComponent { ...@@ -511,7 +511,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
if (!onlyOnline || mac.isOnline()) { if (!onlyOnline || mac.isOnline()) {
INode node = currentView.createNode(mac.getHost().getId()); INode node = currentView.createNode(mac.getHost().getId());
node.setProperty(SiSTypes.PHY_LOCATION, node.setProperty(SiSTypes.PHY_LOCATION,
topoView.getPosition(mac.getMacAddress())); topoView.getPosition(mac.getMacAddress()).clone() );
currentView.addElement(node); currentView.addElement(node);
} }
} }
......
...@@ -340,14 +340,6 @@ public abstract class AbstractTopologyView<L extends DefaultLink> implements ...@@ -340,14 +340,6 @@ public abstract class AbstractTopologyView<L extends DefaultLink> implements
for (Entry<MacAddress, Boolean> entry : neighborsOutdated for (Entry<MacAddress, Boolean> entry : neighborsOutdated
.entrySet()) { .entrySet()) {
entry.setValue(true); entry.setValue(true);
// Fix Christoph Storm: Update positions map
// This relies on location being a PositionVector...
if(location instanceof PositionVector && host.getNetworkComponent().getByName(phy.getNetInterfaceName())
.getLocalInetAddress().equals(macs.get(entry.getKey()).getNetId())){
positions.put(entry.getKey(), new PositionVector( (PositionVector) location ));
}
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment