From: Michal Rehak <mirehak@cisco.com>
Date: Fri, 20 Jun 2014 11:52:25 +0000 (+0200)
Subject: BUG-1138 - wrong value in OFPXMT_OFB_VLAN_VID in FLOW_MOD
X-Git-Tag: release/helium~623^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=db5988cdf412dd95126ce7d2c61cda1b8dfb9d63

BUG-1138 - wrong value in OFPXMT_OFB_VLAN_VID in FLOW_MOD

- vlanPresent set to true if setting vlanId value
- checkstyle whitespace fix

Change-Id: I667fb667af8d5dcd1bc7216ce1fab9e78b6d2f51
Signed-off-by: Michal Rehak <mirehak@cisco.com>
---

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java
index a879a36f8c..36045cabf4 100644
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/FromSalConversionsUtils.java
@@ -205,6 +205,7 @@ public class FromSalConversionsUtils {
             VlanIdBuilder vlanIDBuilder = new VlanIdBuilder();
             vlanIDBuilder.setVlanId(new VlanId((NetUtils
                     .getUnsignedShort((short) vlan.getValue()))));
+            vlanIDBuilder.setVlanIdPresent(true);
             vlanMatchBuild.setVlanId(vlanIDBuilder.build());
         }