commit 7466d61447612e9a2be39f7194a4e9bc41fdc831
author Jonathan Hart <jono@onlab.us> Mon Nov 24 17:09:53 2014 -0800
committer Jonathan Hart <jono@onlab.us> Mon Nov 24 17:09:53 2014 -0800
tree 68eff41452e468149bad6a350efd619b12dacf2b
parent d1a467fd6f3374ba0056b585c7f84c6366e6231f

Null checking in packet-out mechanism.

If the switch has recently disconnected, we can get some NullPointerExceptions.

Change-Id: Ia5a854ed5cd6a933974c855e7297faa542626d9e

core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java
index 793e759..123b727 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java
@@ -95,6 +95,10 @@
         NodeId myId = clusterService.getLocalNode().id();
         NodeId master = mastershipService.getMasterFor(packet.sendThrough());
 
+        if (master == null) {
+            return;
+        }
+
         if (myId.equals(master)) {
             notifyDelegate(new PacketEvent(Type.EMIT, packet));
             return;