commit e71494d3eca71bcb4cd84da5152202af171d043c
author Hyunsun Moon <hyunsun.moon@gmail.com> Tue Nov 15 14:45:25 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Nov 18 15:32:41 2016 +0000
tree d401387bfc9ae8258733d01b2aaf44a4d7af1fe6
parent 5ba6ec1955930309e847c8d3a8b4c5d3c6085cc7

ONOS-5674 Fixed to check device type in OF controller device listener

Change-Id: I101427f2f8db215d3e87223b9ffc784b4fa0cca1

protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java

diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
index 4427c72..1b53bbd 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
@@ -29,7 +29,6 @@
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.core.CoreService;
 import org.onosproject.net.device.DeviceEvent;
-import org.onosproject.net.device.DeviceEvent.Type;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.driver.DefaultDriverProviderService;
@@ -87,6 +86,8 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.net.Device.Type.CONTROLLER;
+import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_REMOVED;
 import static org.onosproject.openflow.controller.Dpid.dpid;
 
 @Component(immediate = true)
@@ -538,7 +539,7 @@
 
         @Override
         public boolean isRelevant(DeviceEvent event) {
-            return event.type() == Type.DEVICE_REMOVED;
+            return event.subject().type() != CONTROLLER && event.type() == DEVICE_REMOVED;
         }
 
         @Override