forked from apache/netbeans
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Step and Continue after breakpoint suspends at wrong place after eval…
…. [NETBEANS-6123]
- Loading branch information
Showing
7 changed files
with
241 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/impl/StepUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.netbeans.modules.debugger.jpda.impl; | ||
|
|
||
| import com.sun.jdi.IncompatibleThreadStateException; | ||
| import com.sun.jdi.ThreadReference; | ||
| import com.sun.jdi.request.StepRequest; | ||
| import org.netbeans.modules.debugger.jpda.jdi.IllegalThreadStateExceptionWrapper; | ||
|
|
||
| import org.netbeans.modules.debugger.jpda.jdi.InternalExceptionWrapper; | ||
| import org.netbeans.modules.debugger.jpda.jdi.InvalidStackFrameExceptionWrapper; | ||
| import org.netbeans.modules.debugger.jpda.jdi.ObjectCollectedExceptionWrapper; | ||
| import org.netbeans.modules.debugger.jpda.jdi.ThreadReferenceWrapper; | ||
| import org.netbeans.modules.debugger.jpda.jdi.VMDisconnectedExceptionWrapper; | ||
| import org.netbeans.modules.debugger.jpda.jdi.request.EventRequestWrapper; | ||
|
|
||
| public final class StepUtils { | ||
|
|
||
| private static final String STEP_PROP_DEPTH = "originalThreadDepth"; // NOI18N | ||
|
|
||
| private StepUtils() {} | ||
|
|
||
| /** | ||
| * Mark the frame depth of the thread when the step is created. It's to be retrieved | ||
| * by {@link #getOriginalStepDepth(com.sun.jdi.request.StepRequest)}. | ||
| */ | ||
| public static void markOriginalStepDepth(StepRequest stepRequest, ThreadReference threadReference) { | ||
| try { | ||
| EventRequestWrapper.putProperty(stepRequest, STEP_PROP_DEPTH, ThreadReferenceWrapper.frameCount(threadReference)); | ||
| } catch (IllegalThreadStateExceptionWrapper | IncompatibleThreadStateException | InternalExceptionWrapper | | ||
| InvalidStackFrameExceptionWrapper | ObjectCollectedExceptionWrapper | VMDisconnectedExceptionWrapper ex) { | ||
| // Not successful, ignore. | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get the frame depth of the thread when the step was submitted, or <code>-1</code> when unknown. | ||
| */ | ||
| public static int getOriginalStepDepth(StepRequest stepRequest) { | ||
| Object depth; | ||
| try { | ||
| depth = EventRequestWrapper.getProperty(stepRequest, STEP_PROP_DEPTH); | ||
| } catch (InternalExceptionWrapper | VMDisconnectedExceptionWrapper ex) { | ||
| return -1; | ||
| } | ||
| if (depth instanceof Integer) { | ||
| return (Integer) depth; | ||
| } | ||
| return -1; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...bugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/StepAndContinueApp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.netbeans.api.debugger.jpda.testapps; | ||
|
|
||
| /** | ||
| * A sample application where we combine stepping and breakpoints with continue. | ||
| * | ||
| * @author Martin Entlicher | ||
| */ | ||
| public class StepAndContinueApp { | ||
|
|
||
| public static void main(String[] args) { | ||
| StepAndContinueApp sa = new StepAndContinueApp(); | ||
| int x = sa.m1(); // STOP Over4 | ||
| x += sa.m2(); // STOP Over5 | ||
| x += sa.m3(); // STOP Out7 | ||
| } | ||
|
|
||
| private int m1() { | ||
| int im1 = 10; // LBREAKPOINT | ||
| m2(); // STOP Over1 | ||
| m3(); // STOP Over2 | ||
| return im1; // STOP Over3 | ||
| } | ||
|
|
||
| private int m2() { | ||
| int im2 = 20; // STOP Into6 | ||
| m3(); | ||
| return im2; | ||
| } | ||
|
|
||
| private int m3() { | ||
| int im3 = 30; // STOP Into8 | ||
| return im3; // LBREAKPOINT | ||
| } | ||
|
|
||
| } |