Only create FinalizerService executor if started

blrnw3 · Nov 7, 2018 · d011454 · d011454
1 parent 1fb288a
commit d011454
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/util/FinalizerService.java b/presto-main/src/main/java/com/facebook/presto/util/FinalizerService.java
@@ -39,7 +39,8 @@ public class FinalizerService
 
     private final Set<FinalizerReference> finalizers = Sets.newConcurrentHashSet();
     private final ReferenceQueue<Object> finalizerQueue = new ReferenceQueue<>();
-    private final ExecutorService executor = newSingleThreadExecutor(daemonThreadsNamed("FinalizerService"));
+    @GuardedBy("this")
+    private ExecutorService executor;
 
     @GuardedBy("this")
     private Future<?> finalizerTask;
@@ -50,6 +51,9 @@ public synchronized void start()
         if (finalizerTask != null) {
             return;
         }
+        if (executor == null) {
+            executor = newSingleThreadExecutor(daemonThreadsNamed("FinalizerService"));
+        }
         if (executor.isShutdown()) {
             throw new IllegalStateException("Finalizer service has been destroyed");
         }
@@ -63,7 +67,10 @@ public synchronized void destroy()
             finalizerTask.cancel(true);
             finalizerTask = null;
         }
-        executor.shutdownNow();
+        if (executor != null) {
+            executor.shutdownNow();
+            executor = null;
+        }
     }
 
     /**