From 5eab857bb2e16b13a224270c9f766bc0e433e34c Mon Sep 17 00:00:00 2001 From: Mahesh Poojary S Date: Tue, 1 Sep 2015 17:45:48 +0530 Subject: [PATCH] Resolving issue in parsing report message. Change-Id: Iab4bcab84d1a732946737497e9780fa3461e9355 --- .../onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java | 4 ++++ .../provider/pcep/tunnel/impl/PcepTunnelProvider.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java index 1312fa22ca..2eba09b8a6 100644 --- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java +++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java @@ -26,6 +26,7 @@ import org.onosproject.pcepio.types.PcepErrorDetailInfo; import org.onosproject.pcepio.types.PcepObjectHeader; import org.onosproject.pcepio.types.PcepValueType; import org.onosproject.pcepio.types.StatefulIPv4LspIdentidiersTlv; +import org.onosproject.pcepio.types.StatefulLspDbVerTlv; import org.onosproject.pcepio.types.StatefulLspErrorCodeTlv; import org.onosproject.pcepio.types.StatefulRsvpErrorSpecTlv; import org.onosproject.pcepio.types.SymbolicPathNameTlv; @@ -337,6 +338,9 @@ public class PcepLspObjectVer1 implements PcepLspObject { case SymbolicPathNameTlv.TYPE: tlv = SymbolicPathNameTlv.read(cb, hLength); break; + case StatefulLspDbVerTlv.TYPE: + tlv = StatefulLspDbVerTlv.read(cb); + break; default: throw new PcepParseException("Received unsupported TLV type :" + hType); } diff --git a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java index e859870319..ee5dba4964 100644 --- a/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java +++ b/providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java @@ -1008,7 +1008,10 @@ public class PcepTunnelProvider extends AbstractProvider implements TunnelProvid PcepStateReport.PcepMsgPath msgPath = stateRpt.getMsgPath(); checkNotNull(msgPath); PcepRroObject rroObj = msgPath.getRroObject(); - checkNotNull(rroObj); + if (rroObj == null) { + log.debug("RRO object is null in sate report"); + return; + } int bandwidth = 0; log.debug("Handle Sync report received from PCC.");