GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Support specifying the exception types you want to break on (#481) · sorteam/java-debug@9df6f5d

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

.github
- CODEOWNERS
com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core
- DebugSession.java
- DebugSettings.java
- IDebugSession.java
- adapter/handler
  - SetExceptionBreakpointsRequestHandler.java
- protocol
  - Requests.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎.github/CODEOWNERS‎`

Copy file name to clipboard

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @testforstephen @jdneo @Eskibear @CsCherrYY`
	`1`	`+* @testforstephen @jdneo`

Collapse file

`‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSession.java

+86-12Lines changed: 86 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,16 +16,26 @@`
`16`	`16`	`import java.util.ArrayList;`
`17`	`17`	`import java.util.List;`
`18`	`18`
	`19`	`+import org.apache.commons.lang3.StringUtils;`
	`20`	`+`
`19`	`21`	`import com.sun.jdi.ObjectCollectedException;`
	`22`	`+import com.sun.jdi.ReferenceType;`
`20`	`23`	`import com.sun.jdi.ThreadReference;`
	`24`	`+import com.sun.jdi.VMDisconnectedException;`
`21`	`25`	`import com.sun.jdi.VirtualMachine;`
	`26`	`+import com.sun.jdi.event.ClassPrepareEvent;`
	`27`	`+import com.sun.jdi.request.ClassPrepareRequest;`
`22`	`28`	`import com.sun.jdi.request.EventRequest;`
`23`	`29`	`import com.sun.jdi.request.EventRequestManager;`
`24`	`30`	`import com.sun.jdi.request.ExceptionRequest;`
`25`	`31`
	`32`	`+import io.reactivex.disposables.Disposable;`
	`33`	`+`
`26`	`34`	`public class DebugSession implements IDebugSession {`
`27`	`35`	`private VirtualMachine vm;`
`28`	`36`	`private EventHub eventHub = new EventHub();`
	`37`	`+ private List<EventRequest> eventRequests = new ArrayList<>();`
	`38`	`+ private List<Disposable> subscriptions = new ArrayList<>();`
`29`	`39`
`30`	`40`	`public DebugSession(VirtualMachine virtualMachine) {`
`31`	`41`	`vm = virtualMachine;`
`@@ -136,9 +146,27 @@ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught`
`136`	`146`
`137`	`147`	`@Override`
`138`	`148`	`public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] classFilters, String[] classExclusionFilters) {`
	`149`	`+ setExceptionBreakpoints(notifyCaught, notifyUncaught, null, classFilters, classExclusionFilters);`
	`150`	`+ }`
	`151`	`+`
	`152`	`+ @Override`
	`153`	`+ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes,`
	`154`	`+ String[] classFilters, String[] classExclusionFilters) {`
`139`	`155`	`EventRequestManager manager = vm.eventRequestManager();`
`140`		`- ArrayList<ExceptionRequest> legacy = new ArrayList<>(manager.exceptionRequests());`
`141`		`- manager.deleteEventRequests(legacy);`
	`156`	`+`
	`157`	`+ try {`
	`158`	`+ ArrayList<ExceptionRequest> legacy = new ArrayList<>(manager.exceptionRequests());`
	`159`	`+ manager.deleteEventRequests(legacy);`
	`160`	`+ manager.deleteEventRequests(eventRequests);`
	`161`	`+ } catch (VMDisconnectedException ex) {`
	`162`	`+ // ignore since removing breakpoints is meaningless when JVM is terminated.`
	`163`	`+ }`
	`164`	`+ subscriptions.forEach(subscription -> {`
	`165`	`+ subscription.dispose();`
	`166`	`+ });`
	`167`	`+ subscriptions.clear();`
	`168`	`+ eventRequests.clear();`
	`169`	`+`
`142`	`170`	`// When no exception breakpoints are requested, no need to create an empty exception request.`
`143`	`171`	`if (notifyCaught \|\| notifyUncaught) {`
`144`	`172`	`// from: https://www.javatips.net/api/REPLmode-master/src/jm/mode/replmode/REPLRunner.java`
`@@ -153,20 +181,48 @@ public void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught`
`153`	`181`	`// a thread to be available, and queries it by calling allThreads().`
`154`	`182`	`// See org.eclipse.debug.jdi.tests.AbstractJDITest for the example.`
`155`	`183`
`156`		`- // get only the uncaught exceptions`
`157`		`- ExceptionRequest request = manager.createExceptionRequest(null, notifyCaught, notifyUncaught);`
`158`		`- request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);`
`159`		`- if (classFilters != null) {`
`160`		`- for (String classFilter : classFilters) {`
`161`		`- request.addClassFilter(classFilter);`
	`184`	`+ if (exceptionTypes == null \|\| exceptionTypes.length == 0) {`
	`185`	`+ ExceptionRequest request = manager.createExceptionRequest(null, notifyCaught, notifyUncaught);`
	`186`	`+ request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);`
	`187`	`+ if (classFilters != null) {`
	`188`	`+ for (String classFilter : classFilters) {`
	`189`	`+ request.addClassFilter(classFilter);`
	`190`	`+ }`
`162`	`191`	`}`
	`192`	`+ if (classExclusionFilters != null) {`
	`193`	`+ for (String exclusionFilter : classExclusionFilters) {`
	`194`	`+ request.addClassExclusionFilter(exclusionFilter);`
	`195`	`+ }`
	`196`	`+ }`
	`197`	`+ request.enable();`
	`198`	`+ return;`
`163`	`199`	`}`
`164`		`- if (classExclusionFilters != null) {`
`165`		`- for (String exclusionFilter : classExclusionFilters) {`
`166`		`- request.addClassExclusionFilter(exclusionFilter);`
	`200`	`+`
	`201`	`+ for (String exceptionType : exceptionTypes) {`
	`202`	`+ if (StringUtils.isBlank(exceptionType)) {`
	`203`	`+ continue;`
	`204`	`+ }`
	`205`	`+`
	`206`	`+ // register exception breakpoint in the future loaded classes.`
	`207`	`+ ClassPrepareRequest classPrepareRequest = manager.createClassPrepareRequest();`
	`208`	`+ classPrepareRequest.addClassFilter(exceptionType);`
	`209`	`+ classPrepareRequest.enable();`
	`210`	`+ eventRequests.add(classPrepareRequest);`
	`211`	`+`
	`212`	`+ Disposable subscription = eventHub.events()`
	`213`	`+ .filter(debugEvent -> debugEvent.event instanceof ClassPrepareEvent`
	`214`	`+ && eventRequests.contains(debugEvent.event.request()))`
	`215`	`+ .subscribe(debugEvent -> {`
	`216`	`+ ClassPrepareEvent event = (ClassPrepareEvent) debugEvent.event;`
	`217`	`+ createExceptionBreakpoint(event.referenceType(), notifyCaught, notifyUncaught, classFilters, classExclusionFilters);`
	`218`	`+ });`
	`219`	`+ subscriptions.add(subscription);`
	`220`	`+`
	`221`	`+ // register exception breakpoint in the loaded classes.`
	`222`	`+ for (ReferenceType refType : vm.classesByName(exceptionType)) {`
	`223`	`+ createExceptionBreakpoint(refType, notifyCaught, notifyUncaught, classFilters, classExclusionFilters);`
`167`	`224`	`}`
`168`	`225`	`}`
`169`		`- request.enable();`
`170`	`226`	`}`
`171`	`227`	`}`
`172`	`228`
`@@ -195,4 +251,22 @@ public IMethodBreakpoint createFunctionBreakpoint(String className, String funct`
`195`	`251`	`int hitCount) {`
`196`	`252`	`return new MethodBreakpoint(vm, this.getEventHub(), className, functionName, condition, hitCount);`
`197`	`253`	`}`
	`254`	`+`
	`255`	`+ private void createExceptionBreakpoint(ReferenceType refType, boolean notifyCaught, boolean notifyUncaught,`
	`256`	`+ String[] classFilters, String[] classExclusionFilters) {`
	`257`	`+ EventRequestManager manager = vm.eventRequestManager();`
	`258`	`+ ExceptionRequest request = manager.createExceptionRequest(refType, notifyCaught, notifyUncaught);`
	`259`	`+ request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);`
	`260`	`+ if (classFilters != null) {`
	`261`	`+ for (String classFilter : classFilters) {`
	`262`	`+ request.addClassFilter(classFilter);`
	`263`	`+ }`
	`264`	`+ }`
	`265`	`+ if (classExclusionFilters != null) {`
	`266`	`+ for (String exclusionFilter : classExclusionFilters) {`
	`267`	`+ request.addClassExclusionFilter(exclusionFilter);`
	`268`	`+ }`
	`269`	`+ }`
	`270`	`+ request.enable();`
	`271`	`+ }`
`198`	`272`	`}`

Collapse file

`‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSettings.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/DebugSettings.java

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`import com.google.gson.JsonSyntaxException;`
`20`	`20`	`import com.google.gson.annotations.SerializedName;`
`21`	`21`	`import com.microsoft.java.debug.core.protocol.JsonUtils;`
`22`		`-import com.microsoft.java.debug.core.protocol.Requests.ClassFilters;`
	`22`	`+import com.microsoft.java.debug.core.protocol.Requests.ExceptionFilters;`
`23`	`23`	`import com.microsoft.java.debug.core.protocol.Requests.StepFilters;`
`24`	`24`
`25`	`25`	`public final class DebugSettings {`
`@@ -39,7 +39,7 @@ public final class DebugSettings {`
`39`	`39`	`public String javaHome;`
`40`	`40`	`public HotCodeReplace hotCodeReplace = HotCodeReplace.MANUAL;`
`41`	`41`	`public StepFilters stepFilters = new StepFilters();`
`42`		`- public ClassFilters exceptionFilters = new ClassFilters();`
	`42`	`+ public ExceptionFilters exceptionFilters = new ExceptionFilters();`
`43`	`43`	`public boolean exceptionFiltersUpdated = false;`
`44`	`44`	`public int limitOfVariablesPerJdwpRequest = 100;`
`45`	`45`	`public int jdwpRequestTimeout = 3000;`

Collapse file

`‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/IDebugSession.java

+2Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public interface IDebugSession {`
`38`	`38`
`39`	`39`	`void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] classFilters, String[] classExclusionFilters);`
`40`	`40`
	`41`	`+ void setExceptionBreakpoints(boolean notifyCaught, boolean notifyUncaught, String[] exceptionTypes, String[] classFilters, String[] classExclusionFilters);`
	`42`	`+`
`41`	`43`	`IMethodBreakpoint createFunctionBreakpoint(String className, String functionName, String condition, int hitCount);`
`42`	`44`
`43`	`45`	`Process process();`

Collapse file

`‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/SetExceptionBreakpointsRequestHandler.java

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`import com.microsoft.java.debug.core.adapter.IDebugRequestHandler;`
`27`	`27`	`import com.microsoft.java.debug.core.protocol.Messages.Response;`
`28`	`28`	`import com.microsoft.java.debug.core.protocol.Requests.Arguments;`
`29`		`-import com.microsoft.java.debug.core.protocol.Requests.ClassFilters;`
`30`	`29`	`import com.microsoft.java.debug.core.protocol.Requests.Command;`
	`30`	`+import com.microsoft.java.debug.core.protocol.Requests.ExceptionFilters;`
`31`	`31`	`import com.microsoft.java.debug.core.protocol.Requests.SetExceptionBreakpointsArguments;`
`32`	`32`	`import com.microsoft.java.debug.core.protocol.Types;`
`33`	`33`	`import com.sun.jdi.event.VMDeathEvent;`
`@@ -77,10 +77,11 @@ public synchronized CompletableFuture<Response> handle(Command command, Argument`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`private void setExceptionBreakpoints(IDebugSession debugSession, boolean notifyCaught, boolean notifyUncaught) {`
`80`		`- ClassFilters exceptionFilters = DebugSettings.getCurrent().exceptionFilters;`
	`80`	`+ ExceptionFilters exceptionFilters = DebugSettings.getCurrent().exceptionFilters;`
	`81`	`+ String[] exceptionTypes = (exceptionFilters == null ? null : exceptionFilters.exceptionTypes);`
`81`	`82`	`String[] classFilters = (exceptionFilters == null ? null : exceptionFilters.allowClasses);`
`82`	`83`	`String[] classExclusionFilters = (exceptionFilters == null ? null : exceptionFilters.skipClasses);`
`83`		`- debugSession.setExceptionBreakpoints(notifyCaught, notifyUncaught, classFilters, classExclusionFilters);`
	`84`	`+ debugSession.setExceptionBreakpoints(notifyCaught, notifyUncaught, exceptionTypes, classFilters, classExclusionFilters);`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`@Override`

Collapse file

`‎com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Requests.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Requests.java

+9Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,15 @@ public static class ClassFilters {`
`67`	`67`	`public String[] skipClasses = new String[0];`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ public static class ExceptionFilters extends ClassFilters {`
	`71`	`+ /**`
	`72`	`+ * Specifies that exceptions which are instances of refType will be reported.`
	`73`	`+ * Note: this will include instances of sub-types. If null, all instances`
	`74`	`+ * will be reported.`
	`75`	`+ */`
	`76`	`+ public String[] exceptionTypes = new String[0];`
	`77`	`+ }`
	`78`	`+`
`70`	`79`	`public static class StepFilters extends ClassFilters {`
`71`	`80`	`/**`
`72`	`81`	`* Deprecated - please use {@link ClassFilters#skipClasses } instead.`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.