From bb7c4fb32eea79b6490d0169a8a1f6c5a16d1c40 Mon Sep 17 00:00:00 2001 From: Jaehong Kim Date: Fri, 3 Apr 2015 17:17:15 +0900 Subject: [PATCH] change abstract to concrete method --- .../bootstrap/interceptor/SpanSimpleAroundInterceptor.java | 4 +++- .../interceptor/StandardHostValveInvokeInterceptor.java | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java index 3a389869b..bbf0e4c3f 100644 --- a/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java +++ b/bootstrap/src/main/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptor.java @@ -96,7 +96,9 @@ public abstract class SpanSimpleAroundInterceptor implements SimpleAroundInterce protected abstract void doInAfterTrace(final RecordableTrace trace, final Object target, final Object[] args, final Object result, Throwable throwable); - protected abstract void deleteTrace(final Trace trace, final Object target, final Object[] args, final Object result, Throwable throwable); + protected void deleteTrace(final Trace trace, final Object target, final Object[] args, final Object result, Throwable throwable) { + trace.traceRootBlockEnd(); + } @Override public void setMethodDescriptor(MethodDescriptor descriptor) { diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/interceptor/StandardHostValveInvokeInterceptor.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/interceptor/StandardHostValveInvokeInterceptor.java index f8f4e7a99..79a3a56ac 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/interceptor/StandardHostValveInvokeInterceptor.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/tomcat/interceptor/StandardHostValveInvokeInterceptor.java @@ -219,9 +219,4 @@ public class StandardHostValveInvokeInterceptor extends SpanSimpleAroundIntercep this.excludeUrlFilter = profilerConfig.getTomcatExcludeUrlFilter(); } - - @Override - protected void deleteTrace(Trace trace, Object target, Object[] args, Object result, Throwable throwable) { - trace.traceRootBlockEnd(); - } }