SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SendErrorFilter: put response code into RequestContext, keep consistent with normal cases (#2004)

Browse Source
This commit is contained in:
Jin Zhang
2017-06-08 00:06:35 +08:00
committed by Spencer Gibb
parent 9e180b8ba7
commit c5d95ca805
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilter.java
View File

@@ -87,6 +87,7 @@ public class SendErrorFilter extends ZuulFilter {
if (dispatcher != null) {
ctx.set(SEND_ERROR_FILTER_RAN, true);
if (!ctx.getResponse().isCommitted()) {
ctx.setResponseStatusCode(exception.nStatusCode);
dispatcher.forward(request, ctx.getResponse());
}
}

14
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilterTests.java
View File

@@ -29,6 +29,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
import com.netflix.zuul.context.RequestContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
@@ -82,4 +83,17 @@ public class SendErrorFilterTests {
filter.run();
assertFalse("shouldFilter returned true", filter.shouldFilter());
}
@Test
public void setResponseCode() {
SendErrorFilter filter = createSendErrorFilter(new MockHttpServletRequest());
filter.run();
RequestContext ctx = RequestContext.getCurrentContext();
int resCode = ctx.getResponse().getStatus();
int ctxCode = ctx.getResponseStatusCode();
assertEquals("invalid response code: " + resCode, HttpStatus.NOT_FOUND.value(), resCode);
assertEquals("invalid response code in RequestContext: " + ctxCode, resCode, ctxCode);
}
}