Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 1683024 from lucene/dev/branches/branch_5x: 

SOLR-7484: make it possible to override sendError and execute
........


git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1683025 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2015-06-02 00:36:41 +00:00
parent 99e54ab044
commit 8c5b480e71
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
View File

@ -618,7 +618,7 @@ public class HttpSolrCall {
} }
} }
void sendError(int code, String message) throws IOException { protected void sendError(int code, String message) throws IOException {
try { try {
response.sendError(code, message); response.sendError(code, message);
} catch (EOFException e) { } catch (EOFException e) {

10
solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
View File

@ -222,7 +222,7 @@ public class SolrDispatchFilter extends BaseSolrFilter {
} }
} }
HttpSolrCall call = new HttpSolrCall(this, cores, (HttpServletRequest) request, (HttpServletResponse) response, retry); HttpSolrCall call = getHttpSolrCall((HttpServletRequest) request, (HttpServletResponse) response, retry);
try { try {
Action result = call.call(); Action result = call.call();
switch (result) { switch (result) {
@ -240,6 +240,14 @@ public class SolrDispatchFilter extends BaseSolrFilter {
call.destroy(); call.destroy();
} }
} }
/**
* Allow a subclass to modify the HttpSolrCall. In particular, subclasses may
* want to add attributes to the request and send errors differently
*/
protected HttpSolrCall getHttpSolrCall(HttpServletRequest request, HttpServletResponse response, boolean retry) {
return new HttpSolrCall(this, cores, request, response, retry);
}
private boolean authenticateRequest(ServletRequest request, ServletResponse response, final AtomicReference<ServletRequest> wrappedRequest) throws IOException { private boolean authenticateRequest(ServletRequest request, ServletResponse response, final AtomicReference<ServletRequest> wrappedRequest) throws IOException {
final AtomicBoolean isAuthenticated = new AtomicBoolean(false); final AtomicBoolean isAuthenticated = new AtomicBoolean(false);