[incubator-skywalking] branch master updated: fix no language attr value in mesh (#2182)

[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 334dd03  fix no language attr value in mesh (#2182)
334dd03 is described below

commit 334dd03429faac996b1b2bd3e6e6846c475dd921
Author: Gao Hongtao <hanahm...@gmail.com>
AuthorDate: Sat Jan 19 10:48:54 2019 +0800

    fix no language attr value in mesh (#2182)
---
 .../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 aa4bb8c..e80d616 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
@@ -216,6 +216,8 @@ public class MetadataQueryEsDAO extends EsDAO implements 
IMetadataQueryDAO {
                         serviceInstance.getAttributes().add(new 
Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4));
                     }
                 }
+            } else {
+                serviceInstance.setLanguage(Language.UNKNOWN);
             }
 
             serviceInstances.add(serviceInstance);
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 e7a1c2a..b5e12cd 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
@@ -241,6 +241,8 @@ public class H2MetadataQueryDAO implements 
IMetadataQueryDAO {
                                 serviceInstance.getAttributes().add(new 
Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4));
                             }
                         }
+                    } else {
+                        serviceInstance.setLanguage(Language.UNKNOWN);
                     }
 
                     serviceInstances.add(serviceInstance);