attempt to fix NPE in LinkDiscovery

Change-Id: Iec3e2ed4a0fee2fb0c6ad9a0e383c2024efc10a0

attempt to fix NPE in LinkDiscovery
Change-Id: Iec3e2ed4a0fee2fb0c6ad9a0e383c2024efc10a0
Yuta HIGUCHI
Commit 70ce84382423823a5b42003def8a71d9d1a4d24a 70ce8438 1 parent 7f3df231
Showing 1 changed file with 6 additions and 1 deletions
providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java
--- a/providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java
View file @70ce843
+++ b/providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java
View file @70ce843
@@ -339,9 +339,14 @@ public class LinkDiscovery implements TimerTask {
             final Iterator<Integer> fastIterator = this.fastPorts.iterator();
             while (fastIterator.hasNext()) {
                 final Integer portNumber = fastIterator.next();
+                OFPortDesc port = findPort(portNumber);
+                if (port == null) {
+                    // port can be null
+                    // #removePort modifies `ports` outside synchronized block
+                    continue;
+                }
                 final int probeCount = this.portProbeCount.get(portNumber)
                         .getAndIncrement();
-                OFPortDesc port = findPort(portNumber);
                 if (probeCount < LinkDiscovery.MAX_PROBE_COUNT) {
                     this.log.debug("sending fast probe to port");