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

Merge branch '5.1.x'

This commit is contained in:
Sebastien Deleuze 2019-02-22 09:50:28 +01:00
parent fb66619187 f19d7c0375
commit e5a595e77d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
View File

@ -124,6 +124,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
* @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log) * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log)
*/ */
@Override @Override
@Nullable
public Object invoke(MethodInvocation invocation) throws Throwable { public Object invoke(MethodInvocation invocation) throws Throwable {
Log logger = getLoggerForInvocation(invocation); Log logger = getLoggerForInvocation(invocation);
if (isInterceptorEnabled(invocation, logger)) { if (isInterceptorEnabled(invocation, logger)) {
@ -242,6 +243,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
* @see #writeToLog(Log, String) * @see #writeToLog(Log, String)
* @see #writeToLog(Log, String, Throwable) * @see #writeToLog(Log, String, Throwable)
*/ */
@Nullable
protected abstract Object invokeUnderTrace(MethodInvocation invocation, Log logger) throws Throwable; protected abstract Object invokeUnderTrace(MethodInvocation invocation, Log logger) throws Throwable;
} }