| commit | fe6afd8c3887fc8d1cd327d49676d56edb7a00d4 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Mon Nov 26 14:03:20 2018 -0800 |
| committer | Ray Milkey <ray@opennetworking.org> | Mon Nov 26 23:15:53 2018 +0000 |
| tree | d37f59d4162ba5bd47ecbbb5570c7c5445e60f94 | |
| parent | c4d037797d0f02f117fcd9e81a8d159d3650a704 [diff] |
Sonar suggestions Change-Id: I68d400185ffc885bf92b558a2565a49af149ef0c
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java index 19532cd..73eaa8b 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java +++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
@@ -436,7 +436,7 @@ Criterion metadata = Criteria.matchMetadata((cvid << 32) | outPort); - if (outerVlan == null || innerVlan == null || inport == null) { + if (outerVlan == null || inport == null) { log.error("Forwarding objective is underspecified: {}", fwd); fail(fwd, ObjectiveError.BADPARAMS); return;
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java index fd2ef27..213947c 100644 --- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java +++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeActionGroupProgrammable.java
@@ -352,7 +352,7 @@ groupMirror.annotations(handle).value(MAX_MEM_SIZE) != null) { maxMemSize = groupMirror.annotations(handle).value(MAX_MEM_SIZE); } - if (maxMemSize == "" || currentMemberSize > Integer.parseInt(maxMemSize)) { + if (!maxMemSize.equals("") || currentMemberSize > Integer.parseInt(maxMemSize)) { deleteGroup(group, handle); } }