commit 5eab857bb2e16b13a224270c9f766bc0e433e34c
author Mahesh Poojary S <mahesh.poojary@huawei.com> Tue Sep 01 17:45:48 2015 +0530
committer Ray Milkey <ray@onlab.us> Thu Sep 03 17:24:05 2015 +0000
tree 4fb4b61fff2d035d5f72e588db775b89dbbb3aeb
parent ed540a397531e1816373f4cd89412d326d251349

Resolving issue in parsing report message.

Change-Id: Iab4bcab84d1a732946737497e9780fa3461e9355

pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java

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 1312fa2..2eba09b 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.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 @@
             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);
             }

providers/pcep/tunnel/src/main/java/org/onosproject/provider/pcep/tunnel/impl/PcepTunnelProvider.java

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 e859870..ee5dba4 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 @@
             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.");