홍길동 / 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; ...@@ -28,6 +28,7 @@ import org.onosproject.net.flow.criteria.VlanIdCriterion;
28 import org.onosproject.net.flow.criteria.VlanPcpCriterion; 28 import org.onosproject.net.flow.criteria.VlanPcpCriterion;
29 import org.onosproject.net.flow.criteria.MplsCriterion; 29 import org.onosproject.net.flow.criteria.MplsCriterion;
30 import org.onosproject.net.flow.criteria.IPCriterion; 30 import org.onosproject.net.flow.criteria.IPCriterion;
31 +import org.onosproject.net.flow.criteria.IPv6FlowLabelCriterion;
31 import org.onosproject.net.flow.criteria.Criteria; 32 import org.onosproject.net.flow.criteria.Criteria;
32 import org.onosproject.net.flow.instructions.Instruction; 33 import org.onosproject.net.flow.instructions.Instruction;
33 import org.onosproject.net.flow.instructions.L0ModificationInstruction; 34 import org.onosproject.net.flow.instructions.L0ModificationInstruction;
...@@ -316,9 +317,8 @@ public final class FlowObjectiveCompositionUtil { ...@@ -316,9 +317,8 @@ public final class FlowObjectiveCompositionUtil {
316 } 317 }
317 case IPV6_FLABEL: 318 case IPV6_FLABEL:
318 if (criterionMap.containsKey(Criterion.Type.IPV6_FLABEL)) { 319 if (criterionMap.containsKey(Criterion.Type.IPV6_FLABEL)) {
319 - if (((IPCriterion) criterionMap.get(Criterion.Type.IPV6_FLABEL)).ip() 320 + if (((IPv6FlowLabelCriterion) criterionMap.get(Criterion.Type.IPV6_FLABEL)).flowLabel()
320 - .equals(((L3ModificationInstruction.ModIPv6FlowLabelInstruction) l3) 321 + == (((L3ModificationInstruction.ModIPv6FlowLabelInstruction) l3).flowLabel())) {
321 - .flowLabel())) {
322 criterionMap.remove(Criterion.Type.IPV4_SRC); 322 criterionMap.remove(Criterion.Type.IPV4_SRC);
323 } else { 323 } else {
324 return null; 324 return null;
......