commit 81b724b3328acc0c67b46d629b494b3938c88ccd
author Jonathan Hart <jono@opennetworking.org> Mon Jan 29 16:02:41 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Thu Feb 01 17:47:35 2018 +0000
tree 4135bda5fbb643d3de827b929683ea70c4b8d7b5
parent b170207b68a472166e32ea8eb04d8d699c6fc360

Don't try and write an empty list of OF messages

Change-Id: Ic18971cd0b4b019906d2bdcbe9aef627f79065f7
(cherry picked from commit a65851204fffe5bbc9636a87753f10233b803305)

protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java

diff --git a/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
index 0ec8071..d0bb7da 100644
--- a/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
+++ b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -327,7 +327,7 @@
         this.agent.transitionToMasterSwitch(dpid);
         synchronized (messagesPendingMastership) {
             List<OFMessage> messages = messagesPendingMastership.get();
-            if (messages != null) {
+            if (messages != null && !messages.isEmpty()) {
                 // Cannot use sendMsg here. It will only append to pending list.
                 sendMsgsOnChannel(messages);
                 log.debug("Sending {} pending messages to switch {}",