From 18d2d352fd432ffa645e024fbc9e34d6aaaca2f6 Mon Sep 17 00:00:00 2001
From: caoyixiong <32847163+IanCao@users.noreply.github.com>
Date: Wed, 22 Aug 2018 14:30:58 +0800
Subject: [PATCH] Fix bug stop stopSpan when not createSpan in Spring Callback
 (#1572)

* Fix bug stop stopSpan when not createSpan
---
 .../spring/concurrent/FailureCallbackInterceptor.java     | 8 ++++++++
 .../spring/concurrent/SuccessCallbackInterceptor.java     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java
index a6879b418..234224ba3 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java
@@ -51,12 +51,20 @@ public class FailureCallbackInterceptor implements InstanceMethodsAroundIntercep
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
         Object ret) throws Throwable {
+        Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField();
+        if (cacheValues == null) {
+            return ret;
+        }
         ContextManager.stopSpan();
         return ret;
     }
 
     @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments,
         Class<?>[] argumentsTypes, Throwable t) {
+        Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField();
+        if (cacheValues == null) {
+            return;
+        }
         ContextManager.activeSpan().errorOccurred().log(t);
     }
 }
diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java
index e0ff6c27e..dcacaab7a 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/SuccessCallbackInterceptor.java
@@ -51,12 +51,20 @@ public class SuccessCallbackInterceptor implements InstanceMethodsAroundIntercep
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
         Object ret) throws Throwable {
+        Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField();
+        if (cacheValues == null) {
+            return ret;
+        }
         ContextManager.stopSpan();
         return ret;
     }
 
     @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments,
         Class<?>[] argumentsTypes, Throwable t) {
+        Object[] cacheValues = (Object[])objInst.getSkyWalkingDynamicField();
+        if (cacheValues == null) {
+            return;
+        }
         ContextManager.activeSpan().errorOccurred().log(t);
     }
 }