Merge pull request #1495 from Cousjava/PAYARA-1495-null-check-httpser…

…vicestatsprovider PAYARA-1495 null check for monitoring in HttpServiceStatsProvider
payara · Apr 3, 2017 · d4bec52 · d4bec52
2 parents 0185ba4 + 7be6607
commit d4bec52
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...ver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java b/...ver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java
@@ -209,11 +209,15 @@ public void postConstruct() {
     }
 
     private long getInitialOpenConnections(){
-        GrizzlyMonitoring monitoring = Globals.get(GrizzlyService.class).getMonitoring();
         long initialCount = 0;
-        for (String networkListener : networkListeners) {
-            ConnectionQueueStatsProvider connectionQueueStats = monitoring.getConnectionQueueStatsProvider(networkListener);
-            initialCount += connectionQueueStats.getOpenConnectionsCount().getCount();
+        GrizzlyMonitoring monitoring = Globals.get(GrizzlyService.class).getMonitoring();
+        if (monitoring != null) {
+            for (String networkListener : networkListeners) {
+                ConnectionQueueStatsProvider connectionQueueStats = monitoring.getConnectionQueueStatsProvider(networkListener);
+                initialCount += connectionQueueStats.getOpenConnectionsCount().getCount();
+            }
+        } else {
+            logger.log(Level.FINER, "Tried to get monitoring service connections before service started");
         }
         return initialCount;
     }