moparisthebest/beehive
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Execute post-request interceptors in a finally of their own

Browse Source
This commit is contained in:
Travis Burtrum 2019-01-08 15:13:07 -05:00
parent 55573244f3
commit c351d203d6
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
beehive-netui-core/src/main/java/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
View File

@ -854,39 +854,37 @@ public class PageFlowRequestProcessor
}
finally
{
//
// If this is not a forwarded request, then commit any session-scoped changes that were stored in the
// request.
//
if ( ! isForwardedRequest )
{
Handlers.get( getServletContext() ).getStorageHandler().applyChanges( requestContext );
}
try {
//
// If this is not a forwarded request, then commit any session-scoped changes that were stored in the
// request.
//
if (!isForwardedRequest) {
Handlers.get(getServletContext()).getStorageHandler().applyChanges(requestContext);
}
//
// Callback to the server adapter.
//
_servletContainerAdapter.endRequest( request, response );
long timeTaken = System.currentTimeMillis() - startTime;
er.endActionRequest( requestContext, timeTaken );
//
// Callback to the server adapter.
//
_servletContainerAdapter.endRequest(request, response);
long timeTaken = System.currentTimeMillis() - startTime;
er.endActionRequest(requestContext, timeTaken);
//
// Execute post-request interceptors
//
try
{
Interceptors.doPostIntercept( context, interceptors );
}
catch ( InterceptorException e )
{
ServletUtils.throwServletException(e);
}
} finally {
//
// Execute post-request interceptors
//
try {
Interceptors.doPostIntercept(context, interceptors);
} catch (InterceptorException e) {
ServletUtils.throwServletException(e);
}
if ( LOG.isTraceEnabled() )
{
LOG.trace( "-------------------------------- End Request #" +
localRequestCount +
" ------------------------------------" );
if (LOG.isTraceEnabled()) {
LOG.trace("-------------------------------- End Request #" +
localRequestCount +
" ------------------------------------");
}
}
}
}