X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsal%2Fconvertor%2Fmatch%2Fcases%2FSalToOfIpv6MatchCase.java;fp=openflowplugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsal%2Fconvertor%2Fmatch%2Fcases%2FSalToOfIpv6MatchCase.java;h=eb9ab1eec5c0cf74fe9386bff3a5e52a10518bea;hb=8b739ad941b510735bb6e5337f98ef77e9f3b8f7;hp=c8297246000be1482ffbb1bc816523b56678fab3;hpb=597a7932a33b9c8d9e56dd7126d910b9c73b2515;p=openflowplugin.git

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchCase.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchCase.java
index c829724600..eb9ab1eec5 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchCase.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/cases/SalToOfIpv6MatchCase.java
@@ -99,17 +99,19 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
 
         if (source.getIpv6Label() != null) {
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-            boolean hasmask = false;
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
             matchEntryBuilder.setOxmMatchField(Ipv6Flabel.VALUE);
             Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder();
             Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder();
             ipv6FlabelBuilder.setIpv6Flabel(source.getIpv6Label().getIpv6Flabel());
 
+            final boolean hasmask;
             if (source.getIpv6Label().getFlabelMask() != null) {
                 hasmask = true;
                 ipv6FlabelBuilder.setMask(ByteUtil.unsignedIntToBytes(
                         source.getIpv6Label().getFlabelMask().getValue()));
+            } else {
+                hasmask = false;
             }
 
             ipv6FlabelCaseBuilder.setIpv6Flabel(ipv6FlabelBuilder.build());
@@ -165,7 +167,6 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
 
         if (source.getIpv6ExtHeader() != null) {
             MatchEntryBuilder matchEntryBuilder = new MatchEntryBuilder();
-            boolean hasmask = false;
             matchEntryBuilder.setOxmClass(OpenflowBasicClass.VALUE);
             matchEntryBuilder.setOxmMatchField(Ipv6Exthdr.VALUE);
             Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder();
@@ -174,9 +175,12 @@ public class SalToOfIpv6MatchCase extends ConvertorCase<Ipv6Match, List<MatchEnt
             int bitmap = source.getIpv6ExtHeader().getIpv6Exthdr().toJava();
             ipv6ExthdrBuilder.setPseudoField(makeIpv6ExthdrFlags(bitmap));
 
+            final boolean hasmask;
             if (source.getIpv6ExtHeader().getIpv6ExthdrMask() != null) {
                 hasmask = true;
                 ipv6ExthdrBuilder.setMask(ByteUtil.unsignedShortToBytes(source.getIpv6ExtHeader().getIpv6ExthdrMask()));
+            } else {
+                hasmask = false;
             }
 
             ipv6ExthdrCaseBuilder.setIpv6Exthdr(ipv6ExthdrBuilder.build());