| commit | bd131782faccb3356500ac86de42a2a7b32678b9 | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Thu Feb 01 17:40:39 2018 -0800 |
| committer | Ray Milkey <ray@opennetworking.org> | Fri Feb 02 13:19:43 2018 -0800 |
| tree | c1d3973bd99e8a8d988ef7c663a0dd58290637a2 | |
| parent | 4bb99b8c3a96573ed3292f22a35a39c8cdf7f4a7 [diff] |
SONAR suggestion - checking the same condition twice Change-Id: Ia71206478c21cc92fbd7d37e7915af75727e047e
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java index 18fc738..feb0049 100644 --- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java +++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java
@@ -215,8 +215,8 @@ if ((!ingressInner.equals(VlanId.NONE) && ingressOuter.equals(VlanId.NONE) && !egressOuter.equals(VlanId.NONE)) - || (!ingressOuter.equals(VlanId.NONE) && - egressOuter.equals(VlanId.NONE) && + || (egressOuter.equals(VlanId.NONE) && + !egressInner.equals(VlanId.NONE) && !ingressOuter.equals(VlanId.NONE))) { throw new IllegalArgumentException(String.valueOf(String.format("Support for double-tag<->" + "single-tag is not supported" +
diff --git a/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java b/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java index cfe3b62..453f9f6 100644 --- a/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java +++ b/utils/misc/src/main/java/org/onlab/packet/RIPngEntry.java
@@ -108,7 +108,6 @@ return super.equals(that) && Objects.equals(metric, that.metric) && - Objects.equals(routeTag, that.routeTag) && Objects.equals(prefixLen, that.prefixLen) && Arrays.equals(prefix, that.prefix) && Objects.equals(routeTag, that.routeTag);