From 0313f18f6c09d6d8c373c16febeaf596e7d83ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E5=8B=87=E5=8D=87=20pengys?= <8082209@qq.com>
Date: Thu, 3 May 2018 18:28:23 +0800
Subject: [PATCH] Name incorrect (#1153)

---
 .../storage/es/dao/ui/ApplicationMappingEsUIDAO.java      | 8 ++++----
 apm-dist/bin/collectorService.sh                          | 4 ++--
 apm-dist/bin/webappService.sh                             | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMappingEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMappingEsUIDAO.java
index 53a10b4c9..416447458 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMappingEsUIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMappingEsUIDAO.java
@@ -65,13 +65,13 @@ public class ApplicationMappingEsUIDAO extends EsDAO implements IApplicationMapp
         List<ApplicationMapping> applicationMappings = new LinkedList<>();
         for (Terms.Bucket applicationIdBucket : applicationIdTerms.getBuckets()) {
             int applicationId = applicationIdBucket.getKeyAsNumber().intValue();
-            Terms addressIdTerms = applicationIdBucket.getAggregations().get(ApplicationMappingTable.MAPPING_APPLICATION_ID.getName());
-            for (Terms.Bucket addressIdBucket : addressIdTerms.getBuckets()) {
-                int addressId = addressIdBucket.getKeyAsNumber().intValue();
+            Terms mappingApplicationIdTerms = applicationIdBucket.getAggregations().get(ApplicationMappingTable.MAPPING_APPLICATION_ID.getName());
+            for (Terms.Bucket mappingApplicationIdBucket : mappingApplicationIdTerms.getBuckets()) {
+                int mappingApplicationId = mappingApplicationIdBucket.getKeyAsNumber().intValue();
 
                 ApplicationMapping applicationMapping = new ApplicationMapping();
                 applicationMapping.setApplicationId(applicationId);
-                applicationMapping.setMappingApplicationId(addressId);
+                applicationMapping.setMappingApplicationId(mappingApplicationId);
                 applicationMappings.add(applicationMapping);
             }
         }
diff --git a/apm-dist/bin/collectorService.sh b/apm-dist/bin/collectorService.sh
index f20dad32e..b7b40826a 100644
--- a/apm-dist/bin/collectorService.sh
+++ b/apm-dist/bin/collectorService.sh
@@ -43,8 +43,8 @@ eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} ${COLLECTOR_OPTIONS} -classpath $CLASSPATH
 
 if [ $? -eq 0 ]; then
     sleep 1
-	echo "Skywalking Collector started successfully!"
+	echo "SkyWalking Collector started successfully!"
 else
-	echo "Skywalking Collector started failure!"
+	echo "SkyWalking Collector started failure!"
 	exit 1
 fi
diff --git a/apm-dist/bin/webappService.sh b/apm-dist/bin/webappService.sh
index fdd52c48b..e8dc897ab 100644
--- a/apm-dist/bin/webappService.sh
+++ b/apm-dist/bin/webappService.sh
@@ -40,8 +40,8 @@ eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -jar ${JAR_PATH}/skywalking-webapp.jar \
 
 if [ $? -eq 0 ]; then
     sleep 1
-	echo "Skywalking Web Application started successfully!"
+	echo "SkyWalking Web Application started successfully!"
 else
-	echo "Skywalking Web Application started failure!"
+	echo "SkyWalking Web Application started failure!"
 	exit 1
 fi
-- 
GitLab