commit bf8b67ea9bc5d52d3e14adeae6ccc4b3d9c748ba
author Yi Tseng <a86487817@gmail.com> Thu Sep 01 15:02:11 2016 +0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Sep 01 16:17:44 2016 +0000
tree 33a32dd377647bdbd570ec0840987352d73a3a75
parent 3bbca2a6432280bf70c5f4f6650404618b873125

Refactor bindMacAddr function from VPLS app.

Change-Id: I4f484bbc02dae756e60c9fb5e1d2ef8a0f722b85

apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java

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 4f1e3fa..5551435 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 @@
         VlanId vlanId = e.getKey();
         ConnectPoint cp = e.getValue();
         Set<Host> 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));
         }
     }