commit e64d3758611e1215bf9bf8628435da2aa29a8cb1
author Charles Chan <rascov@gmail.com> Wed Oct 21 13:03:58 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Oct 22 00:40:42 2015 +0000
tree 4193930160e04b4f40bfa2275a691d3fd23bee46
parent d9dfe11fb5d179df1de80bec4f0053e08b8c44ed

[ONOS-3194] Prevent NullPointerException

Some kind of List (e.g. ArrayList) allow the existence of null element
Add protection here in case someone call sw.sendMsg(List<OFMessage>) and pass a list with null element

Change-Id: Ida2ffbb196d2fdcb23b911365fa3c1231eab92ed

openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java

diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
index df7865d..4c1b16f 100644
--- a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
+++ b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
@@ -25,7 +25,6 @@
 import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 
-
 /**
  * Encode an openflow message for output into a ChannelBuffer, for use in a
  * netty pipeline.
@@ -50,7 +49,9 @@
         ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
 
         for (OFMessage ofm : msglist) {
-            ofm.writeTo(buf);
+            if (ofm != null) {
+                ofm.writeTo(buf);
+            }
         }
         return buf;
     }