From e71494d3eca71bcb4cd84da5152202af171d043c Mon Sep 17 00:00:00 2001 From: Hyunsun Moon Date: Tue, 15 Nov 2016 14:45:25 -0800 Subject: [PATCH] ONOS-5674 Fixed to check device type in OF controller device listener Change-Id: I101427f2f8db215d3e87223b9ffc784b4fa0cca1 --- .../openflow/controller/impl/OpenFlowControllerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 4427c72876..1b53bbd58e 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.apache.felix.scr.annotations.Service; 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.Lock; 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 @@ public class OpenFlowControllerImpl implements OpenFlowController { @Override public boolean isRelevant(DeviceEvent event) { - return event.type() == Type.DEVICE_REMOVED; + return event.subject().type() != CONTROLLER && event.type() == DEVICE_REMOVED; } @Override