You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by cr...@apache.org on 2023/10/14 03:14:40 UTC

[dubbo] branch 3.2 updated: fix: set default value for accept (#13199)

This is an automated email from the ASF dual-hosted git repository.

crazyhzm pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new a4a3fd769f fix: set default value for accept (#13199)
a4a3fd769f is described below

commit a4a3fd769f3cd19cbb0b43e8fdb8f387fea80c63
Author: JYZ <31...@users.noreply.github.com>
AuthorDate: Fri Oct 13 22:14:34 2023 -0500

    fix: set default value for accept (#13199)
    
    Co-authored-by: 贾彦昭 <ji...@youzan.com>
---
 .../apache/dubbo/rpc/protocol/rest/filter/ServiceInvokeRestFilter.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/filter/ServiceInvokeRestFilter.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/filter/ServiceInvokeRestFilter.java
index 2e97493c0e..72508ce868 100644
--- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/filter/ServiceInvokeRestFilter.java
+++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/filter/ServiceInvokeRestFilter.java
@@ -46,6 +46,7 @@ import org.apache.dubbo.rpc.protocol.rest.request.RequestFacade;
 import org.apache.dubbo.rpc.protocol.rest.util.MediaTypeUtil;
 
 import java.util.List;
+import java.util.Objects;
 
 @Activate(value = "invoke", order = Integer.MAX_VALUE)
 public class ServiceInvokeRestFilter implements RestRequestFilter {
@@ -179,6 +180,7 @@ public class ServiceInvokeRestFilter implements RestRequestFilter {
      */
     public static MediaType getAcceptMediaType(RequestFacade request, Class<?> returnType) {
         String accept = request.getHeader(RestHeaderEnum.ACCEPT.getHeader());
+        accept = Objects.isNull(accept) ? MediaType.ALL_VALUE.value : accept;
         MediaType mediaType = MediaTypeUtil.convertMediaType(returnType, accept);
         return mediaType;
     }