X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pcep%2Fbase-parser%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fpcep%2Fparser%2Fmessage%2FPCEPReplyMessageParser.java;fp=pcep%2Fbase-parser%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fpcep%2Fparser%2Fmessage%2FPCEPReplyMessageParser.java;h=e83b792618f167de8f4a703e409822476015703e;hb=ce341e5c075ca8378b19e30db8e63f22634a0e98;hp=8e8fa94fbbc45f0d8663f4d1c906d80803b6ee24;hpb=0e6f2667b99fc3261ca78795a1a9ad3614e87c7a;p=bgpcep.git

diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
index 8e8fa94fbb..e83b792618 100644
--- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
+++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
@@ -101,10 +101,8 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         serializeObject(failure.getNoPath(), buffer);
         serializeObject(failure.getLspa(), buffer);
         serializeObject(failure.getBandwidth(), buffer);
-        if (failure.getMetrics() != null) {
-            for (final Metrics m : failure.getMetrics()) {
-                serializeObject(m.getMetric(), buffer);
-            }
+        for (final Metrics m : failure.nonnullMetrics()) {
+            serializeObject(m.getMetric(), buffer);
         }
         serializeObject(failure.getIro(), buffer);
     }
@@ -113,15 +111,13 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         if (success == null || success.getSuccess() == null) {
             return;
         }
-        for (final Paths p : success.getSuccess().getPaths()) {
+        for (final Paths p : success.getSuccess().nonnullPaths()) {
             serializeObject(p.getEro(), buffer);
             serializeObject(p.getLspa(), buffer);
             serializeObject(p.getOf(), buffer);
             serializeObject(p.getBandwidth(), buffer);
-            if (p.getMetrics() != null) {
-                for (final Metrics m : p.getMetrics()) {
-                    serializeObject(m.getMetric(), buffer);
-                }
+            for (final Metrics m : p.nonnullMetrics()) {
+                serializeObject(m.getMetric(), buffer);
             }
             serializeObject(p.getIro(), buffer);
         }
@@ -134,10 +130,8 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
     }
 
     private void serializeMonitoringMetrics(final Replies reply, final ByteBuf buffer) {
-        if (reply.getMetricPce() != null) {
-            for (final MetricPce metricPce : reply.getMetricPce()) {
-                serializeMetricPce(metricPce, buffer);
-            }
+        for (final MetricPce metricPce : reply.nonnullMetricPce()) {
+            serializeMetricPce(metricPce, buffer);
         }
     }