|
|
|
@ -1,5 +1,5 @@ |
|
|
|
/* |
|
|
|
/* |
|
|
|
* Copyright 2002-2015 the original author or authors. |
|
|
|
* Copyright 2002-2016 the original author or authors. |
|
|
|
* |
|
|
|
* |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
@ -687,7 +687,7 @@ public class DispatcherPortlet extends FrameworkPortlet { |
|
|
|
throw ex; |
|
|
|
throw ex; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
catch (Error err) { |
|
|
|
catch (Throwable err) { |
|
|
|
PortletException ex = |
|
|
|
PortletException ex = |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
@ -800,7 +800,7 @@ public class DispatcherPortlet extends FrameworkPortlet { |
|
|
|
triggerAfterRenderCompletion(mappedHandler, interceptorIndex, request, response, ex); |
|
|
|
triggerAfterRenderCompletion(mappedHandler, interceptorIndex, request, response, ex); |
|
|
|
throw ex; |
|
|
|
throw ex; |
|
|
|
} |
|
|
|
} |
|
|
|
catch (Error err) { |
|
|
|
catch (Throwable err) { |
|
|
|
PortletException ex = |
|
|
|
PortletException ex = |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
@ -891,7 +891,7 @@ public class DispatcherPortlet extends FrameworkPortlet { |
|
|
|
triggerAfterResourceCompletion(mappedHandler, interceptorIndex, request, response, ex); |
|
|
|
triggerAfterResourceCompletion(mappedHandler, interceptorIndex, request, response, ex); |
|
|
|
throw ex; |
|
|
|
throw ex; |
|
|
|
} |
|
|
|
} |
|
|
|
catch (Error err) { |
|
|
|
catch (Throwable err) { |
|
|
|
PortletException ex = |
|
|
|
PortletException ex = |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
@ -965,7 +965,7 @@ public class DispatcherPortlet extends FrameworkPortlet { |
|
|
|
throw ex; |
|
|
|
throw ex; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
catch (Error err) { |
|
|
|
catch (Throwable err) { |
|
|
|
PortletException ex = |
|
|
|
PortletException ex = |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
new PortletException("Error occured during request processing: " + err.getMessage(), err); |
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
// Trigger after-completion for thrown exception.
|
|
|
|
|