Merge pull request #516 from jewzaam/fix-servo-publisher-singleton-init

Updated HystrixServoMetricsPublisher initalization of singleton
Netflix · Jan 16, 2015 · ef3735f · ef3735f
2 parents ad0c9de + c728638
commit ef3735f
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/...rc/main/java/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisher.java b/...rc/main/java/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisher.java
@@ -34,12 +34,24 @@
  */
 public class HystrixServoMetricsPublisher extends HystrixMetricsPublisher {
 
-    private static HystrixServoMetricsPublisher INSTANCE = new HystrixServoMetricsPublisher();
+    private static HystrixServoMetricsPublisher INSTANCE = null;
 
     public static HystrixServoMetricsPublisher getInstance() {
+        if (INSTANCE == null) {
+            HystrixServoMetricsPublisher temp = createInstance();
+            INSTANCE = temp;
+        }
         return INSTANCE;
     }
 
+    private static synchronized HystrixServoMetricsPublisher createInstance() {
+        if (INSTANCE == null) {
+            return new HystrixServoMetricsPublisher();
+        } else {
+            return INSTANCE;
+        }
+    }
+
     private HystrixServoMetricsPublisher() {
     }