commit b7a595855caf40415f8c6f4065da2990e35c3a62
author Tian Jian <tian.jian@zte.com.cn> Thu Oct 18 15:00:34 2018 +0800
committer Ray Milkey <ray@opennetworking.org> Fri Oct 26 18:45:14 2018 +0000
tree 627d377d40c14a90f9e65b227411cb5ffaa12d3a
parent 1a4333c51c4285bf32d61434b27fa3070336935c

Make the code more explicit.

Change-Id: I2933d437f974e3329fb9484035c8a1753063c1a2

core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java

diff --git a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
index 58c26c4..6d0fa50 100644
--- a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
+++ b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
@@ -114,7 +114,7 @@
     public void activate() {
 
         if (maxProcessMillis != 0) {
-            dispatchers.forEach(DispatchLoop::startWatchdog);
+            dispatchers.forEach(DispatchLoop::start);
         }
 
         log.info("Started");
@@ -166,7 +166,6 @@
                     groupedThreads("onos/event",
                     "dispatch-" + name + "%d", log));
             eventsQueue = new LinkedBlockingQueue<>();
-            dispatchFuture = executor.submit(this);
         }
 
         public boolean add(Event event) {
@@ -175,7 +174,6 @@
 
         @Override
         public void run() {
-            stopped = false;
             log.info("Dispatch loop({}) initiated", name);
             while (!stopped) {
                 try {
@@ -211,11 +209,16 @@
         void stop() {
             stopped = true;
             add(KILL_PILL);
+            if (null != dispatchFuture) {
+                dispatchFuture.cancel(true);
+            }
+            stopWatchdog();
         }
 
-        void restart() {
-            dispatchFuture.cancel(true);
+        void start() {
+            stopped = false;
             dispatchFuture = executor.submit(this);
+            startWatchdog();
         }
 
         // Monitors event sinks to make sure none take too long to execute.
@@ -235,7 +238,7 @@
                     // Cancel the old dispatch loop and submit a new one.
 
                     stop();
-                    restart();
+                    start();
                 }
             }
         }