From 14e74ad9f405e95a3590d6b837105a20d8cd4d7a Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Sat, 8 Jan 2022 22:56:27 -0500 Subject: [PATCH] NPE fix for IndexController#getPhysicalTableName (#8397) --- .../storage/plugin/elasticsearch/base/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java index e079e34c9f..90c05ed64c 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/IndexController.java @@ -88,7 +88,7 @@ public enum IndexController { public static final String METRIC_TABLE_NAME = "metric_table"; public static String getPhysicalTableName(String logicName) { - return Optional.of(LOGIC_INDICES_CATALOG.get(logicName)).orElse(logicName); + return Optional.ofNullable(LOGIC_INDICES_CATALOG.get(logicName)).orElse(logicName); } public static void registerRelation(String logicName, String physicalName) { -- GitLab