Skip to content

Commit

Permalink
Fix order of headers in DefaultHandlerExceptionResolver
Browse files Browse the repository at this point in the history
Closes gh-26470
  • Loading branch information
rstoyanchev committed Jan 29, 2021
1 parent ecf5113 commit 30cdeb2
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -278,11 +278,11 @@ protected ModelAndView handleHttpRequestMethodNotSupported(HttpRequestMethodNotS
protected ModelAndView handleHttpMediaTypeNotSupported(HttpMediaTypeNotSupportedException ex,
HttpServletRequest request, HttpServletResponse response, @Nullable Object handler) throws IOException {

response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
List<MediaType> mediaTypes = ex.getSupportedMediaTypes();
if (!CollectionUtils.isEmpty(mediaTypes)) {
response.setHeader("Accept", MediaType.toString(mediaTypes));
}
response.sendError(HttpServletResponse.SC_UNSUPPORTED_MEDIA_TYPE);
return new ModelAndView();
}

Expand Down

0 comments on commit 30cdeb2

Please sign in to comment.