Merge pull request #4834 from Pandrex247/FISH-82

FISH-82 Command Line option --warmup results in an Exception when Payara Micro instance stops when Request Tracing is activated

nucleus/payara-modules/requesttracing-core/src/main/java/fish/payara/nucleus/requesttracing/store/RequestTraceStoreFactory.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2017-2019 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017-2020 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -44,13 +44,13 @@
 import fish.payara.nucleus.requesttracing.store.strategy.ReservoirTraceStorageStrategy;
 import fish.payara.nucleus.requesttracing.store.strategy.TraceStorageStrategy;
 import fish.payara.nucleus.store.ClusteredStore;
+import org.glassfish.api.event.Events;
+import org.glassfish.hk2.api.ServiceHandle;
+import org.glassfish.internal.api.Globals;
 
 import java.util.Map;
 import java.util.UUID;
 
-import org.glassfish.api.event.Events;
-import org.glassfish.internal.api.Globals;
-
 /**
  * A factory for generating a
  * {@link fish.payara.nucleus.requesttracing.store.RequestTraceStoreInterface}.
@@ -87,7 +87,12 @@ public static RequestTraceStoreInterface getStore(Events events, boolean reservo
         }
 
         // Get a clustered store if possible
-        ClusteredStore clusteredStore = Globals.getDefaultHabitat().getService(ClusteredStore.class);
+        ClusteredStore clusteredStore = null;
+        ServiceHandle<ClusteredStore> serviceHandle = Globals.getDefaultHabitat().getServiceHandle(ClusteredStore.class);
+        if (serviceHandle != null && serviceHandle.isActive()) {
+            clusteredStore = serviceHandle.getService();
+        }
+
         if (clusteredStore != null && clusteredStore.isEnabled()) {
             Map<UUID, RequestTrace> store = (Map) clusteredStore.getMap(storeName);
             return new ClusteredRequestTraceStore(store, strategy);