[GitHub] wu-sheng closed pull request #1153: Name incorrect

[GitBox <gi...@apache.org>]

wu-sheng closed pull request #1153: Name incorrect
URL: https://github.com/apache/incubator-skywalking/pull/1153
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 ApplicationMappingEsUIDAO(ElasticSearchClient client) {
         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


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services