Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

@@ -41,7 +41,6 @@ import org.projectfloodlight.openflow.protocol.OFHello;
 import org.projectfloodlight.openflow.protocol.OFHelloElem;
 import org.projectfloodlight.openflow.protocol.OFHelloElem;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFPacketIn;
 import org.projectfloodlight.openflow.protocol.OFPacketIn;
-import org.projectfloodlight.openflow.protocol.OFPacketOut;
 import org.projectfloodlight.openflow.protocol.OFPortDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFPortDescStatsReply;
 import org.projectfloodlight.openflow.protocol.OFPortDescStatsRequest;
 import org.projectfloodlight.openflow.protocol.OFPortDescStatsRequest;
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
@@ -661,10 +660,9 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
          * However, we could be more forgiving
          * However, we could be more forgiving
          * @param h the channel handler that received the message
          * @param h the channel handler that received the message
          * @param m the message
          * @param m the message
-         * @throws SwitchStateException
-         * @throws SwitchStateExeption we always through the execption
+         * @throws SwitchStateException we always throw the exception
          */
          */
-        // needs to be protected because enum members are acutally subclasses
+        // needs to be protected because enum members are actually subclasses
         protected void illegalMessageReceived(OFChannelHandler h, OFMessage m)
         protected void illegalMessageReceived(OFChannelHandler h, OFMessage m)
                 throws SwitchStateException {
                 throws SwitchStateException {
             String msg = getSwitchStateMessage(h, m,
             String msg = getSwitchStateMessage(h, m,
@@ -1025,7 +1023,9 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
                 // all state for the original switch (with the same dpid),
                 // all state for the original switch (with the same dpid),
                 // which we obviously don't want.
                 // which we obviously don't want.
                 log.info("{}:removal called", getSwitchInfoString());
                 log.info("{}:removal called", getSwitchInfoString());
-                sw.removeConnectedSwitch();
+                if (sw != null) {
+                    sw.removeConnectedSwitch();
+                }
             } else {
             } else {
                 // A duplicate was disconnected on this ChannelHandler,
                 // A duplicate was disconnected on this ChannelHandler,
                 // this is the same switch reconnecting, but the original state was
                 // this is the same switch reconnecting, but the original state was

@@ -1188,7 +1188,8 @@ public class OFSwitchImplCPqD13 extends AbstractOpenFlowSwitch {
                 .setHardTimeout(0)
                 .setHardTimeout(0)
                 .setXid(getNextTransactionId())
                 .setXid(getNextTransactionId())
                 .build();
                 .build();
-        sendMsg(tableMissEntry);
+
+        write(tableMissEntry);
     }
     }
 
 
     private void sendBarrier(boolean finalBarrier) {
     private void sendBarrier(boolean finalBarrier) {
@@ -1200,7 +1201,8 @@ public class OFSwitchImplCPqD13 extends AbstractOpenFlowSwitch {
                 .buildBarrierRequest()
                 .buildBarrierRequest()
                 .setXid(xid)
                 .setXid(xid)
                 .build();
                 .build();
-        sendMsg(br);
+
+        write(br);
     }
     }
 
 
     @Override
     @Override
@@ -1210,7 +1212,7 @@ public class OFSwitchImplCPqD13 extends AbstractOpenFlowSwitch {
 
 
     @Override
     @Override
     public void write(OFMessage msg) {
     public void write(OFMessage msg) {
-        this.channel.write(msg);
+        this.channel.write(Collections.singletonList(msg));
 
 
     }
     }