From 1afdb3fa790deda169f7213f469bb5e4f62e4123 Mon Sep 17 00:00:00 2001
From: rohitsharan <r.sharan@samsung.com>
Date: Mon, 17 Apr 2017 21:16:13 +0530
Subject: [PATCH] onos-6310:- avoid Null pointer in protocol TL1Controller
 method disconnectDevice

Change-Id: I1e6cd1c7b63747978b1acb95bd56af40538e89bf
---
 .../java/org/onosproject/tl1/impl/DefaultTl1Controller.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protocols/tl1/ctl/src/main/java/org/onosproject/tl1/impl/DefaultTl1Controller.java b/protocols/tl1/ctl/src/main/java/org/onosproject/tl1/impl/DefaultTl1Controller.java
index 7a2fa8fc77..118c43fbc9 100644
--- a/protocols/tl1/ctl/src/main/java/org/onosproject/tl1/impl/DefaultTl1Controller.java
+++ b/protocols/tl1/ctl/src/main/java/org/onosproject/tl1/impl/DefaultTl1Controller.java
@@ -211,9 +211,9 @@ public class DefaultTl1Controller implements Tl1Controller {
         Channel channel = device.channel();
         if (channel != null) {
             channel.close();
+            msgMap.remove(channel);
         }
 
-        msgMap.remove(channel);
         device.disconnect();
         tl1Listeners.forEach(l -> l.deviceDisconnected(deviceId));
     }