From f3bf42b5239fb21b23884ca46e2048f6de3f9017 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Fri, 11 Apr 2025 15:20:06 +0800
Subject: [PATCH] fix:fix NPE when using getConfigItem.

---
 .../polaris/dubbo/metadata/report/PolarisMetadataReport.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dubbo-plugins/dubbo-metadatareport-polaris/src/main/java/com/tencent/polaris/dubbo/metadata/report/PolarisMetadataReport.java b/dubbo-plugins/dubbo-metadatareport-polaris/src/main/java/com/tencent/polaris/dubbo/metadata/report/PolarisMetadataReport.java
index 8d9ed47..1a74373 100644
--- a/dubbo-plugins/dubbo-metadatareport-polaris/src/main/java/com/tencent/polaris/dubbo/metadata/report/PolarisMetadataReport.java
+++ b/dubbo-plugins/dubbo-metadatareport-polaris/src/main/java/com/tencent/polaris/dubbo/metadata/report/PolarisMetadataReport.java
@@ -153,7 +153,7 @@ public MetadataInfo getAppMetadata(SubscriberMetadataIdentifier identifier, Map<
         Optional<ServiceContractProto.ServiceContract> result = getServiceContract(request);
         if (!result.isPresent()) {
             // 降级，由兜底的 MetadataReport 进行处理
-            return another.map(proxyReport -> proxyReport.getMetadataReport().getAppMetadata(identifier, instanceMetadata)).orElse(MetadataInfo.EMPTY);
+            return another.map(proxyReport -> proxyReport.getMetadataReport().getAppMetadata(identifier, instanceMetadata)).orElse(null);
         }
 
         Map<String, MetadataInfo.ServiceInfo> serviceInfos = new HashMap<>();
@@ -397,7 +397,7 @@ public void run() {
     // -------- 仅用于 multi-metadata-report 情况下使用
     @Override
     public ConfigItem getConfigItem(String key, String group) {
-        return another.map(proxyReport -> proxyReport.getConfigItem(key, group)).orElse(null);
+        return another.map(proxyReport -> proxyReport.getConfigItem(key, group)).orElse(new ConfigItem());
     }
 
     @Override