홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
HIGUCHI Yuta
Committed by Gerrit Code Review
d275afd5 1 parent a1da42eb

Fix type mismatch 

Change-Id: I98cf7239e422be816cfee637fde726a015c9c565
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
......@@ -28,6 +28,7 @@ import org.onosproject.net.flow.criteria.VlanIdCriterion;
import org.onosproject.net.flow.criteria.VlanPcpCriterion;
import org.onosproject.net.flow.criteria.MplsCriterion;
import org.onosproject.net.flow.criteria.IPCriterion;
import org.onosproject.net.flow.criteria.IPv6FlowLabelCriterion;
import org.onosproject.net.flow.criteria.Criteria;
import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.L0ModificationInstruction;
......@@ -316,9 +317,8 @@ public final class FlowObjectiveCompositionUtil {
}
case IPV6_FLABEL:
if (criterionMap.containsKey(Criterion.Type.IPV6_FLABEL)) {
if (((IPCriterion) criterionMap.get(Criterion.Type.IPV6_FLABEL)).ip()
.equals(((L3ModificationInstruction.ModIPv6FlowLabelInstruction) l3)
.flowLabel())) {
if (((IPv6FlowLabelCriterion) criterionMap.get(Criterion.Type.IPV6_FLABEL)).flowLabel()
== (((L3ModificationInstruction.ModIPv6FlowLabelInstruction) l3).flowLabel())) {
criterionMap.remove(Criterion.Type.IPV4_SRC);
} else {
return null;
......