[incubator-skywalking] branch master updated: Fix missing language field. (#2174)

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 18ed80b  Fix missing language field. (#2174)
18ed80b is described below

commit 18ed80bd9530a534240846c40fdaa5fc2c0fae64
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Fri Jan 18 08:00:51 2019 +0800

    Fix missing language field. (#2174)
---
 .../server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java   | 2 ++
 .../oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java       | 2 ++
 2 files changed, 4 insertions(+)

diff --git 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
index 80ff9a7..aa4bb8c 100644
--- 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
@@ -197,6 +197,8 @@ public class MetadataQueryEsDAO extends EsDAO implements 
IMetadataQueryDAO {
                 JsonObject properties = GSON.fromJson(propertiesString, 
JsonObject.class);
                 if (properties.has(LANGUAGE)) {
                     
serviceInstance.setLanguage(LanguageTrans.INSTANCE.value(properties.get(LANGUAGE).getAsString()));
+                } else {
+                    serviceInstance.setLanguage(Language.UNKNOWN);
                 }
 
                 if (properties.has(OS_NAME)) {
diff --git 
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
 
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
index 301887f..e7a1c2a 100644
--- 
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
@@ -222,6 +222,8 @@ public class H2MetadataQueryDAO implements 
IMetadataQueryDAO {
                         JsonObject properties = 
GSON.fromJson(propertiesString, JsonObject.class);
                         if (properties.has(LANGUAGE)) {
                             
serviceInstance.setLanguage(LanguageTrans.INSTANCE.value(properties.get(LANGUAGE).getAsString()));
+                        } else {
+                            serviceInstance.setLanguage(Language.UNKNOWN);
                         }
 
                         if (properties.has(OS_NAME)) {