commit fc52fecc3bfab33a1a4392c0d0319dccd42bd982
author Thomas Vachuska <tom@onlab.us> Mon May 18 19:13:56 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue May 19 17:56:49 2015 +0000
tree 2b08717977f5af61712fee27b99efecc977278d8
parent 7f58211229b49c39f75fc6f06c1810dc16fc1398

Fixed a slew of shutdown exceptions that arose due to improper or out-of-order resource clean-up, e.g. listeners, timers, executors.

Change-Id: I37c351c4202b32e92c076d9d566b96d7ff8d313a

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

diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
index 65a8c55..50c0351 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -96,14 +96,14 @@
 
     @Override
     public final void sendMsg(OFMessage m) {
-        if (role == RoleState.MASTER) {
+        if (role == RoleState.MASTER && channel.isWritable()) {
             channel.write(Collections.singletonList(m));
         }
     }
 
     @Override
     public final void sendMsg(List<OFMessage> msgs) {
-        if (role == RoleState.MASTER) {
+        if (role == RoleState.MASTER && channel.isWritable()) {
             channel.write(msgs);
         }
     }