From ddfa8c99bb708c343914296d6b5b39a4eb4769a6 Mon Sep 17 00:00:00 2001
From: nitinanand <nitin.anand@samsung.com>
Date: Fri, 24 Mar 2017 16:14:23 +0530
Subject: [PATCH] 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
---
 .../main/java/org/onosproject/net/device/impl/DeviceManager.java | 1 +
 1 file changed, 1 insertion(+)

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 3b508820b6..ed26b41ad3 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 @@ public class DeviceManager
             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()))) {