Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-27 17:00:50 +01:00
Code Issues Packages Projects Releases Activity

Fix options request return internal server error (#1688)

Browse Source
This commit is contained in:
Sebastian Sdorra
2021-06-09 13:09:25 +02:00
committed by GitHub
parent 017708fc6f
commit 35fe536170
5 changed files with 260 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-webapp/src/main/java/sonia/scm/api/WebApplicationExceptionMapper.java
View File

@@ -26,7 +26,6 @@ package sonia.scm.api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import sonia.scm.api.v2.resources.ErrorDto;
import sonia.scm.web.VndMediaType;
@@ -34,7 +33,6 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import java.util.Collections;
@Provider
public class WebApplicationExceptionMapper implements ExceptionMapper<WebApplicationException> {
@@ -47,12 +45,8 @@ public class WebApplicationExceptionMapper implements ExceptionMapper<WebApplica
public Response toResponse(WebApplicationException exception) {
LOG.trace("caught web application exception", exception);
ErrorDto errorDto = new ErrorDto();
errorDto.setMessage(exception.getMessage());
errorDto.setContext(Collections.emptyList());
errorDto.setErrorCode(ERROR_CODE);
errorDto.setTransactionId(MDC.get("transaction_id"));
ErrorDto errorDto = ErrorDtos.from(ERROR_CODE, exception);
Response originalResponse = exception.getResponse();
return Response.fromResponse(originalResponse)