zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repair httpGetLarge#httpGetLarge will call entity.getContentType().getElements() the contentType is NPE

Browse Source
This commit is contained in:
pbting 2019-08-09 12:15:05 +08:00
parent 6496ae5cd6
commit 68f170c930
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
naming/src/main/java/com/alibaba/nacos/naming/controllers/DistroController.java
View File

@ -32,6 +32,7 @@ import com.alibaba.nacos.naming.misc.UtilsAndCommons;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -106,7 +107,7 @@ public class DistroController {
} }
@RequestMapping(value = "/datum", method = RequestMethod.GET) @RequestMapping(value = "/datum", method = RequestMethod.GET)
public void get(HttpServletRequest request, HttpServletResponse response) throws Exception { public ResponseEntity get(HttpServletRequest request, HttpServletResponse response) throws Exception {
String entity = IOUtils.toString(request.getInputStream(), "UTF-8"); String entity = IOUtils.toString(request.getInputStream(), "UTF-8");
String keys = JSON.parseObject(entity).getString("keys"); String keys = JSON.parseObject(entity).getString("keys");
@ -119,7 +120,9 @@ public class DistroController {
} }
datumMap.put(key, datum); datumMap.put(key, datum);
} }
response.getWriter().write(new String(serializer.serialize(datumMap), StandardCharsets.UTF_8));
String content = new String(serializer.serialize(datumMap), StandardCharsets.UTF_8);
return ResponseEntity.ok(content);
} }
@RequestMapping(value = "/datums", method = RequestMethod.GET) @RequestMapping(value = "/datums", method = RequestMethod.GET)