From 630e62312ce1dc37d60780351d15f68ff47dd5f0 Mon Sep 17 00:00:00 2001
From: "Xin,Zhang" <zhangxin@apache.org>
Date: Wed, 18 Jul 2018 10:19:35 +0800
Subject: [PATCH] Fix #1454: fix NPE issue about spring apo interceptor (#1467)

---
 .../apm/plugin/spring/patch/CreateAopProxyInterceptor.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java
index 2186bc1b3..a7300e419 100644
--- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java
@@ -44,7 +44,8 @@ public class CreateAopProxyInterceptor implements InstanceMethodsAroundIntercept
         Object ret) throws Throwable {
         AdvisedSupport advisedSupport = (AdvisedSupport)allArguments[0];
 
-        if (EnhancedInstance.class.isAssignableFrom(advisedSupport.getTargetClass())) {
+        Class targetClass = advisedSupport.getTargetClass();
+        if (targetClass != null && EnhancedInstance.class.isAssignableFrom(targetClass)) {
             return true;
         }
         return ret;