VlanMapImpl.transmit(): Check existence of mapped node connector correctly. 52/2852/1
authorShigeru Yasuda <s-yasuda@da.jp.nec.com>
Tue, 19 Nov 2013 07:22:04 +0000 (16:22 +0900)
committerShigeru Yasuda <s-yasuda@da.jp.nec.com>
Tue, 19 Nov 2013 07:22:04 +0000 (16:22 +0900)
getPorts() never returns null, and it returns an empty set if no port is
mapped to the VLAN mapping.

Change-Id: Idce2f6ac0f2b2f66f20d0b92e234312f7968612b
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VlanMapImpl.java

index b9495da29607d67d23fedbf35b1085bac14aecea..e51e0ae7ef1737522eed124bca3f5a38fe80ddf1 100644 (file)
@@ -287,7 +287,7 @@ public final class VlanMapImpl implements VBridgeNode, Serializable {
      */
     void transmit(VTNManagerImpl mgr, PacketContext pctx, Set<PortVlan> sent) {
         Set<NodeConnector> ports = getPorts(mgr);
-        if (ports == null) {
+        if (ports.isEmpty()) {
             LOG.trace("{}:{}: transmit: No port is available",
                       mgr.getContainerName(), mapPath);
             return;
@@ -368,7 +368,7 @@ public final class VlanMapImpl implements VBridgeNode, Serializable {
      *
      * @param mgr  VTN Manager service.
      * @return  A set of node connectors.
-     *          Node that {@code null} may be returned.
+     *          An empty set is returned if no node connector is available.
      */
     private Set<NodeConnector> getPorts(VTNManagerImpl mgr) {
         Node node = vlanMapConfig.getNode();