Simplify method isMutualExclusive in Subnet.

Remove redundant 'if' statements.

Change-Id: I4ba0b5da22095e5d294eea008119dc49159795af
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..0a00cda9afccd185a30785ab5296f3505ac3413c 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
@@ -251,17 +251,7 @@ public class Subnet implements Cloneable, Serializable {
     }
 
     public boolean isMutualExclusive(Subnet otherSubnet) {
     }
 
     public boolean isMutualExclusive(Subnet otherSubnet) {

-        if (this.networkAddress.getClass() != otherSubnet.networkAddress
-                .getClass()) {
-            return true;
-        }
-        if (this.isSubnetOf(otherSubnet.getNetworkAddress())) {
-            return false;
-        }
-        if (otherSubnet.isSubnetOf(this.getNetworkAddress())) {
-            return false;
-        }
-        return true;
+        return !(isSubnetOf(otherSubnet.getNetworkAddress()) || otherSubnet.isSubnetOf(getNetworkAddress()));

     }
 
     /**
     }
 
     /**