fix(): getCorsMeta can be null

Rawven · Apr 11, 2024 · 342c64f · 342c64f
1 parent e64fad4
commit 342c64f
Showing 1 changed file with 12 additions and 3 deletions.
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
@@ -83,9 +83,7 @@ public void register(Invoker<?> invoker) {
                     continue;
                 }
                 RequestMapping classMapping = resolver.resolve(serviceMeta);
-                if (classMapping != null) {
-                    classMapping.setCorsMeta(classMapping.getCorsMeta().combine(getGlobalCorsMeta()));
-                }
+                mergeGlobalCorsMeta(classMapping);
                 consumer.accept((methods) -> {
                     MethodMeta methodMeta = new MethodMeta(methods, serviceMeta);
                     RequestMapping methodMapping = resolver.resolve(methodMeta);
@@ -133,6 +131,17 @@ private HandlerMeta buildHandlerMeta(Invoker<?> invoker, MethodMeta methodMeta)
                 serviceDescriptor);
     }
 
+    private void mergeGlobalCorsMeta(RequestMapping mapping) {
+        if (mapping != null) {
+            CorsMeta corsMeta = mapping.getCorsMeta();
+            if (corsMeta != null) {
+                mapping.setCorsMeta(corsMeta.combine(getGlobalCorsMeta()));
+            } else {
+                mapping.setCorsMeta(getGlobalCorsMeta());
+            }
+        }
+    }
+
     @Override
     public void unregister(Invoker<?> invoker) {
         lock.writeLock().lock();