Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3887 Uses new version of Dispatcher#sendError

Browse Source
This commit is contained in:
Lukasz Lenart
2014-02-16 20:08:30 +01:00
parent 51629304b3
commit ef733aa9ee
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+2 -2
View File
@@ -555,10 +555,10 @@ public class Dispatcher {
}
} catch (ConfigurationException e) {
logConfigurationException(request, e);
sendError(request, response, context, HttpServletResponse.SC_NOT_FOUND, e);
sendError(request, response, HttpServletResponse.SC_NOT_FOUND, e);
} catch (Exception e) {
if (handleException || devMode) {
sendError(request, response, context, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
sendError(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
} else {
throw new ServletException(e);
}
core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+1 -1
View File
@@ -409,7 +409,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
mapping = actionMapper.getMapping(request, dispatcher.getConfigurationManager());
} catch (Exception ex) {
log.error("error getting ActionMapping", ex);
dispatcher.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
dispatcher.sendError(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
return;
}
core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
+1 -1
View File
@@ -163,7 +163,7 @@ public class PrepareOperations {
request.setAttribute(STRUTS_ACTION_MAPPING_KEY, mapping);
}
} catch (Exception ex) {
dispatcher.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
dispatcher.sendError(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
}
}
core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class FilterDispatcherTest extends StrutsInternalTestCase {
}
@Override
public void sendError(HttpServletRequest request, HttpServletResponse response, ServletContext ctx, int code, Exception e) {
public void sendError(HttpServletRequest request, HttpServletResponse response, int code, Exception e) {
// NO-OP
}
}