From bf8b67ea9bc5d52d3e14adeae6ccc4b3d9c748ba Mon Sep 17 00:00:00 2001 From: Yi Tseng Date: Thu, 1 Sep 2016 15:02:11 +0800 Subject: [PATCH] Refactor bindMacAddr function from VPLS app. Change-Id: I4f484bbc02dae756e60c9fb5e1d2ef8a0f722b85 --- .../main/java/org/onosproject/vpls/Vpls.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java b/apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java index 4f1e3facee..55514351c8 100644 --- a/apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java +++ b/apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java @@ -177,15 +177,14 @@ public class Vpls { VlanId vlanId = e.getKey(); ConnectPoint cp = e.getValue(); Set connectedHosts = hostService.getConnectedHosts(cp); - if (!connectedHosts.isEmpty()) { - connectedHosts.forEach(host -> { - if (host.vlan().equals(vlanId)) { - confHostPresentCPoint.put(vlanId, Pair.of(cp, host.mac())); - } else { - confHostPresentCPoint.put(vlanId, Pair.of(cp, null)); - } - }); - } else { + connectedHosts.forEach(host -> { + if (host.vlan().equals(vlanId)) { + confHostPresentCPoint.put(vlanId, Pair.of(cp, host.mac())); + } else { + confHostPresentCPoint.put(vlanId, Pair.of(cp, null)); + } + }); + if (connectedHosts.isEmpty()) { confHostPresentCPoint.put(vlanId, Pair.of(cp, null)); } }