BUG-731: reduced complexity

[bgpcep.git] / pcep / impl / src / main / java / org / opendaylight / protocol / pcep / impl / message / PCEPReplyMessageParser.java

diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
index a1a15cba59529cba961c585ecfc0f2878f49f935..256a015f314c8103a567d7afc2c83a4da8b1b29f 100644 (file)
--- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
+++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/message/PCEPReplyMessageParser.java
@@ -64,7 +64,7 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         if (repMsg.getReplies() == null || repMsg.getReplies().isEmpty()) {
             throw new IllegalArgumentException("Replies cannot be null or empty.");
         }
-        ByteBuf buffer = Unpooled.buffer();
+        final ByteBuf buffer = Unpooled.buffer();
         for (final Replies reply : repMsg.getReplies()) {
             if (reply.getRp() == null) {
                 throw new IllegalArgumentException("Reply must contain RP object.");
@@ -80,40 +80,30 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
         if (reply.getResult() != null) {
             if (reply.getResult() instanceof FailureCase) {
                 final FailureCase f = ((FailureCase) reply.getResult());
-                serializeObject(f.getNoPath(), buffer);
-                if (f.getLspa() != null) {
+                if (f != null) {
+                    serializeObject(f.getNoPath(), buffer);
                     serializeObject(f.getLspa(), buffer);
-                }
-                if (f.getBandwidth() != null) {
                     serializeObject(f.getBandwidth(), buffer);
-                }
-                if (f.getMetrics() != null && !f.getMetrics().isEmpty()) {
-                    for (final Metrics m : f.getMetrics()) {
-                        serializeObject(m.getMetric(), buffer);
+                    if (f.getMetrics() != null && !f.getMetrics().isEmpty()) {
+                        for (final Metrics m : f.getMetrics()) {
+                            serializeObject(m.getMetric(), buffer);
+                        }
                     }
-                }
-                if (f.getIro() != null) {
                     serializeObject(f.getIro(), buffer);
                 }
             } else {
                 final SuccessCase s = (SuccessCase) reply.getResult();
-                for (final Paths p : s.getSuccess().getPaths()) {
-                    serializeObject(p.getEro(), buffer);
-                    if (p.getLspa() != null) {
+                if (s != null) {
+                    for (final Paths p : s.getSuccess().getPaths()) {
+                        serializeObject(p.getEro(), buffer);
                         serializeObject(p.getLspa(), buffer);
-                    }
-                    if (p.getOf() != null) {
                         serializeObject(p.getOf(), buffer);
-                    }
-                    if (p.getBandwidth() != null) {
                         serializeObject(p.getBandwidth(), buffer);
-                    }
-                    if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
-                        for (final Metrics m : p.getMetrics()) {
-                            serializeObject(m.getMetric(), buffer);
+                        if (p.getMetrics() != null && !p.getMetrics().isEmpty()) {
+                            for (final Metrics m : p.getMetrics()) {
+                                serializeObject(m.getMetric(), buffer);
+                            }
                         }
-                    }
-                    if (p.getIro() != null) {
                         serializeObject(p.getIro(), buffer);
                     }
                 }