root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

do not check for action exception in resource phase (SPR-6129)

This commit is contained in:
Juergen Hoeller 2009-09-20 21:12:41 +00:00
parent fada151878
commit 9f75eb4f44
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java
View File

@ -586,7 +586,7 @@ public class DispatcherPortlet extends FrameworkPortlet {
* @throws BeansException if initialization failed * @throws BeansException if initialization failed
* @see org.springframework.context.ApplicationContext#getAutowireCapableBeanFactory() * @see org.springframework.context.ApplicationContext#getAutowireCapableBeanFactory()
*/ */
protected Object createDefaultStrategy(ApplicationContext context, Class clazz) throws BeansException { protected Object createDefaultStrategy(ApplicationContext context, Class<?> clazz) throws BeansException {
return context.getAutowireCapableBeanFactory().createBean(clazz); return context.getAutowireCapableBeanFactory().createBean(clazz);
} }
@ -700,7 +700,7 @@ public class DispatcherPortlet extends FrameworkPortlet {
int interceptorIndex = -1; int interceptorIndex = -1;
try { try {
ModelAndView mv = null; ModelAndView mv;
try { try {
// Check for forwarded exception from the action phase // Check for forwarded exception from the action phase
PortletSession session = request.getPortletSession(false); PortletSession session = request.getPortletSession(false);
@ -806,23 +806,8 @@ public class DispatcherPortlet extends FrameworkPortlet {
int interceptorIndex = -1; int interceptorIndex = -1;
try { try {
ModelAndView mv = null; ModelAndView mv;
try { try {
// Check for forwarded exception from the action phase
PortletSession session = request.getPortletSession(false);
if (session != null) {
if (request.getParameter(ACTION_EXCEPTION_RENDER_PARAMETER) != null) {
Exception ex = (Exception) session.getAttribute(ACTION_EXCEPTION_SESSION_ATTRIBUTE);
if (ex != null) {
logger.debug("Render phase found exception caught during action phase - rethrowing it");
throw ex;
}
}
else {
session.removeAttribute(ACTION_EXCEPTION_SESSION_ATTRIBUTE);
}
}
// Determine handler for the current request. // Determine handler for the current request.
mappedHandler = getHandler(request, false); mappedHandler = getHandler(request, false);
if (mappedHandler == null || mappedHandler.getHandler() == null) { if (mappedHandler == null || mappedHandler.getHandler() == null) {
@ -1063,7 +1048,7 @@ public class DispatcherPortlet extends FrameworkPortlet {
* @throws Exception if there's a problem rendering the view * @throws Exception if there's a problem rendering the view
*/ */
protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
View view = null; View view;
if (mv.isReference()) { if (mv.isReference()) {
// We need to resolve the view name. // We need to resolve the view name.
view = resolveViewName(mv.getViewName(), mv.getModelInternal(), request); view = resolveViewName(mv.getViewName(), mv.getModelInternal(), request);