commit 30041b9dde704d68931542aa5bd1a374e849244d
author Andrea Campanella <andrea@opennetworking.org> Fri Jan 28 16:09:08 2022 +0100
committer Andrea Campanella <andrea@opennetworking.org> Fri Jan 28 17:49:13 2022 +0100
tree 17af71b5c5bc410685bfbd54a02a7435863b2d24
parent f82e3bc41b0f3d6651416fa7ee2eac289254e7f7

[VOL-4593] Fixing NPE for c/s tags and TP in decoding the subscriber information

Change-Id: I096f4bfd8b5722657e6d35b7bcbc41802d126761

app/src/main/java/org/opencord/sadis/impl/UniTagInformationCodec.java

diff --git a/app/src/main/java/org/opencord/sadis/impl/UniTagInformationCodec.java b/app/src/main/java/org/opencord/sadis/impl/UniTagInformationCodec.java
index cad67c0..9afbdcc 100644
--- a/app/src/main/java/org/opencord/sadis/impl/UniTagInformationCodec.java
+++ b/app/src/main/java/org/opencord/sadis/impl/UniTagInformationCodec.java
@@ -81,7 +81,6 @@
         if (json == null || !json.isObject()) {
             return null;
         }
-
         UniTagInformation.Builder tagInfoBuilder = new UniTagInformation.Builder();
         String usBp = json.get(US_BP) == null ? EMPTY_BP :
                 json.get(US_BP).asText();
@@ -93,7 +92,7 @@
                 VlanId.vlanId(json.get(UNI_TAG_MATCH).shortValue()))
                 .setPonCTag(json.get(PON_CTAG) == null ? VlanId.vlanId(VlanId.NO_VID) :
                         VlanId.vlanId(json.get(PON_CTAG).shortValue()))
-                .setPonCTag(json.get(PON_STAG) == null ? VlanId.vlanId(VlanId.NO_VID) :
+                .setPonSTag(json.get(PON_STAG) == null ? VlanId.vlanId(VlanId.NO_VID) :
                         VlanId.vlanId(json.get(PON_STAG).shortValue()))
                 .setUsPonCTagPriority(json.get(US_PON_CTAG_PCP) == null ? NO_PCP :
                         json.get(US_PON_CTAG_PCP).asInt())