Index: LV01/LV01Test.java =================================================================== --- LV01/LV01Test.java (revision 551466) +++ LV01/LV01Test.java (working copy) @@ -53,7 +53,7 @@ long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); - int breakpointLine = 42; // after all local vars are printed + int breakpointLine = 60; // after all local vars are printed long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine); Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex); Index: LV03/LV03Test.java =================================================================== --- LV03/LV03Test.java (revision 551466) +++ LV03/LV03Test.java (working copy) @@ -73,7 +73,7 @@ long start = reply.getNextValueAsLong(); int firstLineNumber = debuggeeWrapper.vmMirror.getLineNumber(debuggeeClassId, methodId, start); - int breakpointLine = 48; // just before notification of thread + int breakpointLine = 65; // just before notification of thread long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine); Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex); Index: EV01/EV01Test.java =================================================================== --- EV01/EV01Test.java (revision 551466) +++ EV01/EV01Test.java (working copy) @@ -52,7 +52,7 @@ long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); - int breakpointLine = 39; // a line with first call to 'ptintln' + int breakpointLine = 58; // a line with first call to 'ptintln' long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine); Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex); Index: EV02/EV02Test.java =================================================================== --- EV02/EV02Test.java (revision 551466) +++ EV02/EV02Test.java (working copy) @@ -49,7 +49,7 @@ long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); - int breakpointLine = 39; // a line with first call to 'ptintln' + int breakpointLine = 55; // a line with first call to 'ptintln' long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine); Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex); Index: EV03/EV03Test.java =================================================================== --- EV03/EV03Test.java (revision 551466) +++ EV03/EV03Test.java (working copy) @@ -50,7 +50,7 @@ long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); - int breakpointLine = 39; // a line with first call to 'ptintln' + int breakpointLine = 56; // a line with first call to 'ptintln' long lineCodeIndex = debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine); Breakpoint breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)lineCodeIndex); Index: BR02/BR02Test.java =================================================================== --- BR02/BR02Test.java (revision 551466) +++ BR02/BR02Test.java (working copy) @@ -47,7 +47,7 @@ EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE); String method = "run"; - int breakpointLine = 39; // + int breakpointLine = 54; // long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); Index: BR03/BR03Test.java =================================================================== --- BR03/BR03Test.java (revision 551466) +++ BR03/BR03Test.java (working copy) @@ -85,7 +85,7 @@ logWriter.println("Setting a breakpoint at a line with a first call to 'println' in a run method."); method = "run"; methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); - breakpointLine = 39; // + breakpointLine = 54; // breakpoint = new Breakpoint(DEBUGGEE_CLASS_SIG, method, (int)debuggeeWrapper.vmMirror.getLineCodeIndex(debuggeeClassId, methodId, breakpointLine)); reply = debuggeeWrapper.vmMirror.setBreakpoint(JDWPConstants.TypeTag.CLASS, breakpoint); Index: TD01/TD01Test.java =================================================================== --- TD01/TD01Test.java (revision 551466) +++ TD01/TD01Test.java (working copy) @@ -45,7 +45,7 @@ EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE); String method = "run"; - int breakpointLine = 39; // + int breakpointLine = 53; // long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); Index: TD02/TD02Test.java =================================================================== --- TD02/TD02Test.java (revision 551466) +++ TD02/TD02Test.java (working copy) @@ -60,7 +60,7 @@ EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE); String method = "run"; - int breakpointLine = 39; // + int breakpointLine = 68; // long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method); Index: TD03/TD03Test.java =================================================================== --- TD03/TD03Test.java (revision 551466) +++ TD03/TD03Test.java (working copy) @@ -59,7 +59,7 @@ EventPacket event = debuggeeWrapper.vmMirror.receiveCertainEvent(JDWPConstants.EventKind.CLASS_PREPARE); String method = "run"; - int breakpointLine = 39; // + int breakpointLine = 67; // long debuggeeClassId = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_CLASS_SIG); long methodId = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassId, method);