|
24 | 24 | import javax.servlet.AsyncContext;
|
25 | 25 | import javax.servlet.ServletResponse;
|
26 | 26 | import javax.servlet.http.HttpServletRequest;
|
| 27 | +import javax.servlet.http.HttpServletRequestWrapper; |
27 | 28 | import javax.servlet.http.HttpServletResponse;
|
| 29 | +import javax.servlet.http.HttpServletResponseWrapper; |
28 | 30 |
|
29 | 31 | import org.eclipse.jetty.http.HttpFields;
|
30 | 32 | import org.eclipse.jetty.server.HttpOutput;
|
@@ -98,10 +100,28 @@ private static final class JettyServerHttpRequest extends ServletServerHttpReque
|
98 | 100 | super(createHeaders(request), request, asyncContext, servletPath, bufferFactory, bufferSize);
|
99 | 101 | }
|
100 | 102 |
|
101 |
| - private static MultiValueMap<String, String> createHeaders(HttpServletRequest request) { |
102 |
| - HttpFields fields = ((Request) request).getMetaData().getFields(); |
| 103 | + private static MultiValueMap<String, String> createHeaders(HttpServletRequest servletRequest) { |
| 104 | + Request request = getRequest(servletRequest); |
| 105 | + HttpFields fields = request.getMetaData().getFields(); |
103 | 106 | return new JettyHeadersAdapter(fields);
|
104 | 107 | }
|
| 108 | + |
| 109 | + private static Request getRequest(HttpServletRequest request) { |
| 110 | + if (request instanceof Request) { |
| 111 | + return (Request) request; |
| 112 | + } |
| 113 | + else if (request instanceof HttpServletRequestWrapper) { |
| 114 | + HttpServletRequestWrapper wrapper = (HttpServletRequestWrapper) request; |
| 115 | + HttpServletRequest wrappedRequest = (HttpServletRequest) wrapper.getRequest(); |
| 116 | + return getRequest(wrappedRequest); |
| 117 | + } |
| 118 | + else { |
| 119 | + throw new IllegalArgumentException("Cannot convert [" + request.getClass() + |
| 120 | + "] to org.eclipse.jetty.server.Request"); |
| 121 | + } |
| 122 | + } |
| 123 | + |
| 124 | + |
105 | 125 | }
|
106 | 126 |
|
107 | 127 |
|
@@ -141,11 +161,27 @@ private static final class JettyServerHttpResponse extends BaseJettyServerHttpRe
|
141 | 161 | super(createHeaders(response), response, asyncContext, bufferFactory, bufferSize, request);
|
142 | 162 | }
|
143 | 163 |
|
144 |
| - private static HttpHeaders createHeaders(HttpServletResponse response) { |
145 |
| - HttpFields fields = ((Response) response).getHttpFields(); |
| 164 | + private static HttpHeaders createHeaders(HttpServletResponse servletResponse) { |
| 165 | + Response response = getResponse(servletResponse); |
| 166 | + HttpFields fields = response.getHttpFields(); |
146 | 167 | return new HttpHeaders(new JettyHeadersAdapter(fields));
|
147 | 168 | }
|
148 | 169 |
|
| 170 | + private static Response getResponse(HttpServletResponse response) { |
| 171 | + if (response instanceof Response) { |
| 172 | + return (Response) response; |
| 173 | + } |
| 174 | + else if (response instanceof HttpServletResponseWrapper) { |
| 175 | + HttpServletResponseWrapper wrapper = (HttpServletResponseWrapper) response; |
| 176 | + HttpServletResponse wrappedResponse = (HttpServletResponse) wrapper.getResponse(); |
| 177 | + return getResponse(wrappedResponse); |
| 178 | + } |
| 179 | + else { |
| 180 | + throw new IllegalArgumentException("Cannot convert [" + response.getClass() + |
| 181 | + "] to org.eclipse.jetty.server.Response"); |
| 182 | + } |
| 183 | + } |
| 184 | + |
149 | 185 | @Override
|
150 | 186 | protected void applyHeaders() {
|
151 | 187 | HttpServletResponse response = getNativeResponse();
|
|
0 commit comments