From fa89f2a641016bbeaa33de0fb5192488a2176a8e Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Thu, 30 Nov 2017 13:52:54 -0800 Subject: [PATCH] Fix NPE in PacketManager This happens when a device event comes in when there is no device service available. Change-Id: I50ea44da433979ef0a3a238b22d295e671849ff4 --- .../java/org/onosproject/net/packet/impl/PacketManager.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1ecf5b4a84..943bb93247 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 class PacketManager 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) {