Merge remote-tracking branch 'origin/master'

@@ -34,8 +34,7 @@ public interface Instruction {
     // to create specific instructions.
     // to create specific instructions.
 
 
     /**
     /**
-     * Returns the type of instruction not to be confused
-     * with the instruction's java type.
+     * Returns the type of instruction.
      * @return type of instruction
      * @return type of instruction
      */
      */
     public Type type();
     public Type type();

@@ -228,6 +228,9 @@ public class LinkDiscovery implements TimerTask {
      * @return Packet_out message with LLDP data
      * @return Packet_out message with LLDP data
      */
      */
     private OFPacketOut createLLDPPacketOut(final OFPortDesc port) {
     private OFPacketOut createLLDPPacketOut(final OFPortDesc port) {
+        if (port == null) {
+            return null;
+        }
         OFPacketOut.Builder packetOut = this.ofFactory.buildPacketOut();
         OFPacketOut.Builder packetOut = this.ofFactory.buildPacketOut();
         packetOut.setBufferId(OFBufferId.NO_BUFFER);
         packetOut.setBufferId(OFBufferId.NO_BUFFER);
         OFAction act = this.ofFactory.actions().buildOutput()
         OFAction act = this.ofFactory.actions().buildOutput()
@@ -248,6 +251,9 @@ public class LinkDiscovery implements TimerTask {
      * @return Packet_out message with LLDP data
      * @return Packet_out message with LLDP data
      */
      */
     private OFPacketOut createBDDPPacketOut(final OFPortDesc port) {
     private OFPacketOut createBDDPPacketOut(final OFPortDesc port) {
+        if (port == null) {
+            return null;
+        }
         OFPacketOut.Builder packetOut = sw.factory().buildPacketOut();
         OFPacketOut.Builder packetOut = sw.factory().buildPacketOut();
 
 
         packetOut.setBufferId(OFBufferId.NO_BUFFER);
         packetOut.setBufferId(OFBufferId.NO_BUFFER);
@@ -267,6 +273,9 @@ public class LinkDiscovery implements TimerTask {
 
 
 
 
     private void sendMsg(final OFMessage msg) {
     private void sendMsg(final OFMessage msg) {
+        if (msg == null) {
+            return;
+        }
         this.sw.sendMsg(msg);
         this.sw.sendMsg(msg);
     }
     }
 
 
@@ -389,8 +398,8 @@ public class LinkDiscovery implements TimerTask {
     }
     }
 
 
     public void stop() {
     public void stop() {
-        removeAllPorts();
         timeout.cancel();
         timeout.cancel();
+        removeAllPorts();
     }
     }
 
 
 }
 }