commit 5777064501332dc4d728adbfdb695d1234318a71
author hyunho1986 <horizon.shin@samsung.com> Tue May 30 14:50:35 2017 +0900
committer Ray Milkey <ray@onlab.us> Tue May 30 16:15:39 2017 +0000
tree 600f02956050fafa121ab7cbbc8a12a744b99419
parent ea8ac72d892e87be02beea1a41c14dce5a320230

[ONOS-6534]Device Null Point Error is Expected in PacketManager

Change-Id: Ibc21f78e6f269d902d4d2dfaf3071d804c2c4f72

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 5393aab..4e5c20d 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
@@ -411,7 +411,11 @@
             DeviceId deviceid = request.deviceId().orElse(null);
 
             if (deviceid != null) {
-                pushRule(deviceService.getDevice(deviceid), request);
+                Device device = deviceService.getDevice(deviceid);
+
+                if (device != null) {
+                    pushRule(deviceService.getDevice(deviceid), request);
+                }
             } else {
                 pushToAllDevices(request);
             }
@@ -422,7 +426,11 @@
             DeviceId deviceid = request.deviceId().orElse(null);
 
             if (deviceid != null) {
-                removeRule(deviceService.getDevice(deviceid), request);
+                Device device = deviceService.getDevice(deviceid);
+
+                if (device != null) {
+                    removeRule(deviceService.getDevice(deviceid), request);
+                }
             } else {
                 removeFromAllDevices(request);
             }