fix(): class CorsMeta can be null

Rawven · Apr 11, 2024 · 3be3c0e · 3be3c0e
1 parent 3b1edc1
commit 3be3c0e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...in/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java b/...in/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java
@@ -84,7 +84,11 @@ public void register(Invoker<?> invoker) {
                 }
                 RequestMapping classMapping = resolver.resolve(serviceMeta);
                 if (classMapping != null) {
-                    classMapping.setCorsMeta(classMapping.getCorsMeta().combine(getGlobalCorsMeta()));
+                    if(classMapping.getCorsMeta()!=null) {
+                        classMapping.setCorsMeta(classMapping.getCorsMeta().combine(getGlobalCorsMeta()));
+                    }else {
+                        classMapping.setCorsMeta(getGlobalCorsMeta());
+                    }
                 }
                 consumer.accept((methods) -> {
                     MethodMeta methodMeta = new MethodMeta(methods, serviceMeta);