id: 1150

desc: re-add finalizerGuardian method
zzzppi · Mar 21, 2016 · 9b5e5c0 · 9b5e5c0
1 parent 1103a55
commit 9b5e5c0
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/...m/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java b/...m/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java
@@ -134,6 +134,19 @@ public boolean isRunning() {
     /**
      * Used to protect against leaking ExecutorServices and threads if this class is abandoned for GC without shutting down.
      */
+    @SuppressWarnings("unused")
+    private final Object finalizerGuardian = new Object() {
+        protected void finalize() throws Throwable {
+            if (!executor.isShutdown()) {
+                logger.warn(HystrixMetricsPoller.class.getSimpleName() + " was not shutdown. Caught in Finalize Guardian and shutting down.");
+                try {
+                    shutdown();
+                } catch (Exception e) {
+                    logger.error("Failed to shutdown " + HystrixMetricsPoller.class.getSimpleName(), e);
+                }
+            }
+        };
+    };
 
     public static interface MetricsAsJsonPollerListener {
         public void handleJsonMetric(String json);