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/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e8f94d5 Fix bug: NetworkAddressInventory uses wrong builder to
convert data (#3183)
e8f94d5 is described below
commit e8f94d55c3ddc0e83a774dfceb7bc98ac6224575
Author: kezhenxu94 <[email protected]>
AuthorDate: Mon Jul 29 14:07:37 2019 +0800
Fix bug: NetworkAddressInventory uses wrong builder to convert data (#3183)
---
.../storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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/H2NetworkAddressInventoryCacheDAO.java
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java
old mode 100644
new mode 100755
index d30df13..4b68a30
---
a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java
+++
b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java
@@ -63,7 +63,7 @@ public class H2NetworkAddressInventoryCacheDAO extends
H2SQLExecutor implements
try (ResultSet resultSet = h2Client.executeQuery(connection,
sql.toString(), lastUpdateTime)) {
NetworkAddressInventory addressInventory;
do {
- addressInventory =
(NetworkAddressInventory)toStorageData(resultSet,
NetworkAddressInventory.INDEX_NAME, new ServiceInventory.Builder());
+ addressInventory =
(NetworkAddressInventory)toStorageData(resultSet,
NetworkAddressInventory.INDEX_NAME, new NetworkAddressInventory.Builder());
if (addressInventory != null) {
addressInventories.add(addressInventory);
}