[GR-17521] Agent NullPointerException for getEnclosingMethod.

PullRequest: graal/4169
oracle · Aug 9, 2019 · e4ac613 · e4ac613
2 parents 7598eb1 + 0ea992a
commit e4ac613
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java b/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java
@@ -464,7 +464,7 @@ private static boolean getEnclosingMethod(JNIEnvironment jni, JNIObjectHandle ca
             }
         }
         boolean allowed = enclosing.equal(nullHandle()) || accessVerifier == null || accessVerifier.verifyGetEnclosingMethod(jni, holder, name, signature, enclosing, callerClass);
-        traceBreakpoint(jni, nullHandle(), nullHandle(), callerClass, bp.specification.methodName, allowed ? result : false);
+        traceBreakpoint(jni, nullHandle(), nullHandle(), callerClass, bp.specification.methodName, (allowed && enclosing.notEqual(nullHandle())) ? result : false);
         if (!allowed) {
             jvmtiFunctions().ForceEarlyReturnObject().invoke(jvmtiEnv(), nullHandle(), nullHandle());
         }