From a159a32c5a5c4bf3adb7f88bcd5cb1c0f4141abc Mon Sep 17 00:00:00 2001 From: alshabib Date: Tue, 9 Sep 2014 14:50:51 -0700 Subject: [PATCH] minor cleanup --- .../onlab/onos/provider/of/link/impl/LinkDiscovery.java | 7 ++++--- .../onos/provider/of/link/impl/OpenFlowLinkProvider.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java index f25066014d..2f0d5d87e0 100644 --- a/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java +++ b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java @@ -166,10 +166,11 @@ public class LinkDiscovery implements TimerTask { * * @param port the port */ - public void removePort(final OFPort port) { + public void removePort(final OFPortDesc port) { // Ignore ports that are not on this switch - int portnum = port.getPortNumber(); + int portnum = port.getPortNo().getPortNumber(); + this.ports.remove(portnum); synchronized (this) { if (this.slowPorts.contains(portnum)) { this.slowPorts.remove(portnum); @@ -383,7 +384,7 @@ public class LinkDiscovery implements TimerTask { public void removeAllPorts() { for (OFPortDesc port : sw.getPorts()) { - removePort(port.getPortNo()); + removePort(port); } } diff --git a/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProvider.java b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProvider.java index af0bb65020..2de4b8ca76 100644 --- a/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProvider.java +++ b/providers/of/link/src/main/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProvider.java @@ -125,7 +125,7 @@ public class OpenFlowLinkProvider extends AbstractProvider implements LinkProvid DeviceId.deviceId("of:" + Long.toHexString(dpid.value())), PortNumber.portNumber(port.getPortNo().getPortNumber())); providerService.linksVanished(cp); - ld.removePort(port.getPortNo()); + ld.removePort(port); } }