infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-03 04:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

8076154: com/sun/jdi/InstanceFilter.java failing due to missing MethodEntryRequest calls

Browse Source 
Some jdi tests are failing due to missing MethodEntryRequest events during the test execution.

Reviewed-by: sla, jbachorik
This commit is contained in:
Fredrik Arvidsson 2015-03-30 10:10:19 +02:00
parent e86e812a29
commit eecde5f24c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/test/com/sun/jdi/InstanceFilter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -104,7 +104,10 @@ public class InstanceFilter extends TestScaffold {
return;
}
if (theThis == null) {
// This happens when the thread has exited.
// This happens when the thread has exited or when a
// static method is called. Setting an instance
// filter does not prevent this event from being
// emitted with a this that is null.
methodEntryRequest.disable();
return;
}
@ -138,6 +141,10 @@ public class InstanceFilter extends TestScaffold {
EventRequestManager mgr = vm().eventRequestManager();
methodEntryRequest = mgr.createMethodEntryRequest();
methodEntryRequest.addInstanceFilter(theInstance);
// Thread filter is needed to prevent MethodEntry events
// to be emitted by the debugee when a static method
// is called on any thread.
methodEntryRequest.addThreadFilter(bpe.thread());
methodEntryRequest.enable();
listenUntilVMDisconnect();