| commit | fe0e085ed2869bb5ddd70731b82667c90294207b | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Thu Jan 18 11:14:05 2018 -0800 |
| committer | Ray Milkey <ray@opennetworking.org> | Fri Jan 19 08:59:46 2018 -0800 |
| tree | af28698c308a127af7d762390b05de2041a9adb0 | |
| parent | e319dc2bca5c38093bdc3e94e80f55d417f5c7c8 [diff] |
SONAR suggestions - boolean expressions that are known to be 'true' or 'false' Change-Id: I4e089cb606ecf43444b4d567ad63d622f37506ce
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java index a1cd29a..383ba4d 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java +++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java
@@ -1044,7 +1044,7 @@ for (Instruction ins : fwd.treatment().allInstructions()) { if (ins instanceof OutputInstruction) { OutputInstruction o = (OutputInstruction) ins; - if (o != null && PortNumber.CONTROLLER.equals(o.port())) { + if (PortNumber.CONTROLLER.equals(o.port())) { ttBuilder.add(o); } else { log.warn("Only allowed treatments in versatile forwarding "
diff --git a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaCfmManager.java b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaCfmManager.java index 695dfcb..c39625b 100644 --- a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaCfmManager.java +++ b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaCfmManager.java
@@ -239,7 +239,7 @@ .addModelObject((ModelObject) mseaCfm.mefCfm()).build(); ArrayList anis = new ArrayList<AnnotatedNodeInfo>(); - if (mseaCfm != null && mseaCfm.mefCfm() != null) { + if (mseaCfm.mefCfm() != null) { for (MaintenanceDomain md:mseaCfm.mefCfm().maintenanceDomain()) { for (MaintenanceAssociation ma:md.maintenanceAssociation()) { for (MaintenanceAssociationEndPoint mep:ma.maintenanceAssociationEndPoint()) {
diff --git a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaSaFilteringManager.java b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaSaFilteringManager.java index f9ed7a1..78c6315 100644 --- a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaSaFilteringManager.java +++ b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaSaFilteringManager.java
@@ -119,7 +119,7 @@ reply.sourceIpaddressFiltering((SourceIpaddressFiltering) mo); } } - if (reply != null && reply.sourceIpaddressFiltering() != null && + if (reply.sourceIpaddressFiltering() != null && reply.sourceIpaddressFiltering().interfaceEth0() != null) { return reply.sourceIpaddressFiltering().interfaceEth0().sourceAddressRange(); } else {