From 0baf691ae48f9b6971a0503d8b210e50e50dcb1a Mon Sep 17 00:00:00 2001 From: ascrutae Date: Fri, 1 Sep 2017 12:12:21 +0800 Subject: [PATCH] fix jdbc plugin issue --- .../apm/plugin/jdbc/define/JDBCDriverInterceptor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java index 535b04e88..244d24e17 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/define/JDBCDriverInterceptor.java @@ -23,8 +23,12 @@ public class JDBCDriverInterceptor implements InstanceMethodsAroundInterceptor { @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, Object ret) throws Throwable { - return new SWConnection((String)allArguments[0], - (Properties)allArguments[1], (Connection)ret); + if (ret != null) { + return new SWConnection((String)allArguments[0], + (Properties)allArguments[1], (Connection)ret); + } + + return ret; } @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments,