| commit | 8faf163833187079cf887ad7e5d9cb52f4ce1480 | [log] [tgz] |
|---|---|---|
| author | alshabib <alshabibi.ali@gmail.com> | Tue Sep 09 14:50:57 2014 -0700 |
| committer | alshabib <alshabibi.ali@gmail.com> | Tue Sep 09 14:50:57 2014 -0700 |
| tree | 237f3c136f48b33f1fa6f689982867b8684bb679 | |
| parent | a159a32c5a5c4bf3adb7f88bcd5cb1c0f4141abc [diff] | |
| parent | b196cf47f7a2295ed85f697fc4e420ee0ab5ad58 [diff] |
Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
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 f250660..2f0d5d8 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 @@ * * @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 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 af0bb65..2de4b8c 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 @@ DeviceId.deviceId("of:" + Long.toHexString(dpid.value())), PortNumber.portNumber(port.getPortNo().getPortNumber())); providerService.linksVanished(cp); - ld.removePort(port.getPortNo()); + ld.removePort(port); } }