From 0006cb4b10072a05c6c2f45d5065ae56272ebc89 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Sun, 4 Mar 2018 14:10:51 +0800
Subject: [PATCH] Fixed the NullPointerException in getServerThroughput method.

---
 .../skywalking/apm/collector/ui/service/ServerService.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
index 667c1b864..dd5f3ca05 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
@@ -26,6 +26,7 @@ import java.util.LinkedList;
 import java.util.List;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService;
+import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.core.util.Const;
 import org.apache.skywalking.apm.collector.core.util.StringUtils;
@@ -59,6 +60,7 @@ public class ServerService {
     private final IGCMetricUIDAO gcMetricUIDAO;
     private final IMemoryMetricUIDAO memoryMetricUIDAO;
     private final ApplicationCacheService applicationCacheService;
+    private final InstanceCacheService instanceCacheService;
     private final SecondBetweenService secondBetweenService;
 
     public ServerService(ModuleManager moduleManager) {
@@ -68,6 +70,7 @@ public class ServerService {
         this.gcMetricUIDAO = moduleManager.find(StorageModule.NAME).getService(IGCMetricUIDAO.class);
         this.memoryMetricUIDAO = moduleManager.find(StorageModule.NAME).getService(IMemoryMetricUIDAO.class);
         this.applicationCacheService = moduleManager.find(CacheModule.NAME).getService(ApplicationCacheService.class);
+        this.instanceCacheService = moduleManager.find(CacheModule.NAME).getService(InstanceCacheService.class);
         this.secondBetweenService = new SecondBetweenService(moduleManager);
     }
 
@@ -105,7 +108,8 @@ public class ServerService {
 
         List<AppServerInfo> serverThroughput = instanceMetricUIDAO.getServerThroughput(applicationId, step, startTimeBucket, endTimeBucket, secondBetween, topN, MetricSource.Callee);
         serverThroughput.forEach(appServerInfo -> {
-            String applicationCode = applicationCacheService.getApplicationById(applicationId).getApplicationCode();
+            appServerInfo.setApplicationId(instanceCacheService.getApplicationId(appServerInfo.getId()));
+            String applicationCode = applicationCacheService.getApplicationById(appServerInfo.getApplicationId()).getApplicationCode();
             appServerInfo.setApplicationCode(applicationCode);
             Instance instance = instanceUIDAO.getInstance(appServerInfo.getId());
             appServerInfo.setOsInfo(instance.getOsInfo());