Simplify hasNodeConnector method in Subnet class.

Reduce 'if' conditions for improved readability.

Change-Id: I8ade7bd8546ddc3396c24e8cc3ba6e13abaaa07c
Signed-off-by: Alissa Bonas <abonas@redhat.com>

diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java b/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java
index f33fa18e299f62b8680389150c916a28efb06254..16c09fe3f6a4ddfe62623293b055b53eabde15c0 100644 (file)
--- a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java
+++ b/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Subnet.java
@@ -244,10 +244,7 @@ public class Subnet implements Cloneable, Serializable {
         if (p == null) {
             return false;
         }
         if (p == null) {
             return false;
         }

-        if (this.isFlatLayer2()) {
-            return true;
-        }
-        return this.nodeConnectors.contains(p);
+        return isFlatLayer2() || nodeConnectors.contains(p);

     }
 
     public boolean isMutualExclusive(Subnet otherSubnet) {
     }
 
     public boolean isMutualExclusive(Subnet otherSubnet) {