From 517bb689b221e90fd1d2a72c6c3399fa0dbab1ac Mon Sep 17 00:00:00 2001 From: Alissa Bonas Date: Mon, 16 Dec 2013 17:15:21 +0200 Subject: [PATCH] Simplify hasNodeConnector method in Subnet class. Reduce 'if' conditions for improved readability. Change-Id: I8ade7bd8546ddc3396c24e8cc3ba6e13abaaa07c Signed-off-by: Alissa Bonas --- .../org/opendaylight/controller/switchmanager/Subnet.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 f33fa18e29..16c09fe3f6 100644 --- 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 (this.isFlatLayer2()) { - return true; - } - return this.nodeConnectors.contains(p); + return isFlatLayer2() || nodeConnectors.contains(p); } public boolean isMutualExclusive(Subnet otherSubnet) { -- 2.36.6