Merge pull request #643 from ascrutae/fix/match-failed

fix match failed issue

apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/match/HierarchyMatch.java

@@ -72,7 +72,9 @@ public class HierarchyMatch implements IndirectMatch {
             matchHierarchyClass(implInterface, parentTypes);
         }
 
-        matchHierarchyClass(typeDescription.getSuperClass(), parentTypes);
+        if (typeDescription.getSuperClass() != null) {
+            matchHierarchyClass(typeDescription.getSuperClass(), parentTypes);
+        }
 
         if (parentTypes.size() == 0) {
             return true;

apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/skywalking/apm/plugin/spring/concurrent/match/EitherInterfaceMatch.java

@@ -56,7 +56,10 @@ public abstract class EitherInterfaceMatch implements IndirectMatch {
             matchHierarchyClazz(generic, matchResult);
         }
 
-        matchHierarchyClazz(typeDescription.getSuperClass(), matchResult);
+        if (typeDescription.getSuperClass() != null) {
+            matchHierarchyClazz(typeDescription.getSuperClass(), matchResult);
+        }
+
         return matchResult.result();
     }