commit fa89f2a641016bbeaa33de0fb5192488a2176a8e
author Ray Milkey <ray@opennetworking.org> Thu Nov 30 13:52:54 2017 -0800
committer Ray Milkey <ray@opennetworking.org> Fri Dec 01 20:47:55 2017 +0000
tree 7f689f9d59e6621cf86d7cb0c7260ce91ba3cb7a
parent 83300ca7637229357f19aaf7d50cde498c39edc2

Fix NPE in PacketManager

This happens when a device event comes in when there
is no device service available.

Change-Id: I50ea44da433979ef0a3a238b22d295e671849ff4

core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index 1ecf5b4..943bb93 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -452,6 +452,10 @@
         public void event(DeviceEvent event) {
             eventHandlingExecutor.execute(() -> {
                 try {
+                    if (driverService == null) {
+                        // Event came in after the driver service shut down, nothing to be done
+                        return;
+                    }
                     Device device = event.subject();
                     Driver driver = driverService.getDriver(device.id());
                     if (driver == null) {