commit ddfa8c99bb708c343914296d6b5b39a4eb4769a6
author nitinanand <nitin.anand@samsung.com> Fri Mar 24 16:14:23 2017 +0530
committer Ray Milkey <ray@onlab.us> Tue Mar 28 17:42:11 2017 +0000
tree 8bd1b947052a22e79b3ffd8351ef134805e9fa47
parent 9649cdd51534c466314423a75064342874b434f7

Fix for JIRA issue ONOS-6160. To avoid possible null pointer reference for 'device' object in file 'DeviceManager.java' at line no 574. 

Change-Id: I182d2759486ff13e8a01da6783651e2da69267a0

core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index 3b50882..ed26b41 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -570,6 +570,7 @@
             Device device = getDevice(deviceId);
             if (device == null) {
                 log.trace("Device not found: {}", deviceId);
+                return;
             }
             if ((Device.Type.ROADM.equals(device.type())) ||
                 (Device.Type.OTN.equals(device.type()))) {