Fix AbstractTraceInterceptor null-safety annotations

Closes gh-22435
master
Sebastien Deleuze 6 years ago
parent e47f7ef7b5
commit f19d7c0375
  1. 2
      spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java

@ -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;
} }

Loading…
Cancel
Save