GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch '1.5.x'

pull/7916/merge
Andy Wilkinson 9 years ago
parent
8ca426281b 3342504d7a
commit
3570b06ebf
2 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java
  2. 6
      spring-boot/src/test/java/org/springframework/boot/web/support/ErrorPageFilterTests.java

2
spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java
Unescape View File

@ -177,7 +177,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
} }
setErrorAttributes(request, 500, ex.getMessage()); setErrorAttributes(request, 500, ex.getMessage());
request.setAttribute(ERROR_EXCEPTION, ex); request.setAttribute(ERROR_EXCEPTION, ex);
request.setAttribute(ERROR_EXCEPTION_TYPE, ex.getClass().getName()); request.setAttribute(ERROR_EXCEPTION_TYPE, ex.getClass());
response.reset(); response.reset();
response.sendError(500, ex.getMessage()); response.sendError(500, ex.getMessage());
request.getRequestDispatcher(path).forward(request, response); request.getRequestDispatcher(path).forward(request, response);

6
spring-boot/src/test/java/org/springframework/boot/web/support/ErrorPageFilterTests.java
Unescape View File

@ -262,7 +262,7 @@ public class ErrorPageFilterTests {
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_MESSAGE)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_MESSAGE))
.isEqualTo("BAD"); .isEqualTo("BAD");
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE))
.isEqualTo(RuntimeException.class.getName()); .isEqualTo(RuntimeException.class);
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI))
.isEqualTo("/test/path"); .isEqualTo("/test/path");
assertThat(this.response.isCommitted()).isTrue(); assertThat(this.response.isCommitted()).isTrue();
@ -319,7 +319,7 @@ public class ErrorPageFilterTests {
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_MESSAGE)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_MESSAGE))
.isEqualTo("BAD"); .isEqualTo("BAD");
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE))
.isEqualTo(IllegalStateException.class.getName()); .isEqualTo(IllegalStateException.class);
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI))
.isEqualTo("/test/path"); .isEqualTo("/test/path");
assertThat(this.response.isCommitted()).isTrue(); assertThat(this.response.isCommitted()).isTrue();
@ -493,7 +493,7 @@ public class ErrorPageFilterTests {
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_MESSAGE)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_MESSAGE))
.isEqualTo("BAD"); .isEqualTo("BAD");
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE))
.isEqualTo(RuntimeException.class.getName()); .isEqualTo(RuntimeException.class);
assertThat(this.request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI)) assertThat(this.request.getAttribute(RequestDispatcher.ERROR_REQUEST_URI))
.isEqualTo("/test/path"); .isEqualTo("/test/path");
assertThat(this.response.isCommitted()).isTrue(); assertThat(this.response.isCommitted()).isTrue();

Write Preview
Loading…
Cancel
Save