commit cb2cc1d97496eace1281778efe9e3a28d9c6f41f
author Carmelo Cascone <carmelo@opennetworking.org> Thu Jan 28 18:25:59 2021 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Mon Feb 01 19:25:10 2021 -0800
tree 7814bd11092d744dce2e8d7508f3293c3bc8e269
parent 620d6e311b54fa7c4ffc1e9b4305a902c1df555b

Fix issues seen during bundle refresh with shared executors

Shared executors are shut down by CoreManager during bundle refresh,
which creates issues in many apps/subsystems. This change fixes only
those issues seen in TOST.

- Fix NPE, by shutting down executors only if initialized
- Fix timer already cancelled by re-creating resources depending
  on terminated executors

Change-Id: I00cfb451c54ada67ab94b09edb486d49a5bd084f

utils/misc/src/main/java/org/onlab/util/SharedExecutors.java

diff --git a/utils/misc/src/main/java/org/onlab/util/SharedExecutors.java b/utils/misc/src/main/java/org/onlab/util/SharedExecutors.java
index 6d92ce6..cc99bcc 100644
--- a/utils/misc/src/main/java/org/onlab/util/SharedExecutors.java
+++ b/utils/misc/src/main/java/org/onlab/util/SharedExecutors.java
@@ -108,12 +108,14 @@
      */
     public static void shutdown() {
         synchronized (SHARED_TIMER_LOCK) {
-            sharedTimer.shutdown();
-            singleThreadExecutor.backingExecutor().shutdown();
-            poolThreadExecutor.backingExecutor().shutdown();
-            sharedTimer = null;
-            singleThreadExecutor = null;
-            poolThreadExecutor = null;
+            if (sharedTimer != null) {
+                sharedTimer.shutdown();
+                singleThreadExecutor.backingExecutor().shutdown();
+                poolThreadExecutor.backingExecutor().shutdown();
+                sharedTimer = null;
+                singleThreadExecutor = null;
+                poolThreadExecutor = null;
+            }
         }
     }
 

utils/misc/src/main/java/org/onlab/util/SharedScheduledExecutors.java

diff --git a/utils/misc/src/main/java/org/onlab/util/SharedScheduledExecutors.java b/utils/misc/src/main/java/org/onlab/util/SharedScheduledExecutors.java
index cfba06d..9141438 100644
--- a/utils/misc/src/main/java/org/onlab/util/SharedScheduledExecutors.java
+++ b/utils/misc/src/main/java/org/onlab/util/SharedScheduledExecutors.java
@@ -116,10 +116,12 @@
      */
     public static void shutdown() {
         synchronized (EXECUTORS_LOCK) {
-            singleThreadExecutor.backingExecutor().shutdown();
-            singleThreadExecutor = null;
-            poolThreadExecutor.backingExecutor().shutdown();
-            poolThreadExecutor = null;
+            if (singleThreadExecutor != null) {
+                singleThreadExecutor.backingExecutor().shutdown();
+                singleThreadExecutor = null;
+                poolThreadExecutor.backingExecutor().shutdown();
+                poolThreadExecutor = null;
+            }
         }
     }
 }