From f19d7c03751e8bec17c4eaff75127f7594734d01 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Thu, 21 Feb 2019 15:58:49 +0100 Subject: [PATCH] Fix AbstractTraceInterceptor null-safety annotations Closes gh-22435 --- .../aop/interceptor/AbstractTraceInterceptor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java index ce6c7f2642..9c68df587f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java +++ b/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) */ @Override + @Nullable public Object invoke(MethodInvocation invocation) throws Throwable { Log logger = getLoggerForInvocation(invocation); if (isInterceptorEnabled(invocation, logger)) { @@ -242,6 +243,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser * @see #writeToLog(Log, String) * @see #writeToLog(Log, String, Throwable) */ + @Nullable protected abstract Object invokeUnderTrace(MethodInvocation invocation, Log logger) throws Throwable; }