changeset 22459:298c63b1d555

Truffle/REPL debugger: breakpoint list now correctly updated when some are clared
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Thu, 12 Nov 2015 12:24:45 -0800
parents cb2c60249e28
children c350ef0119c6
files truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLHandler.java truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServer.java
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLHandler.java	Thu Nov 12 12:09:24 2015 -0800
+++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLHandler.java	Thu Nov 12 12:24:45 2015 -0800
@@ -334,7 +334,7 @@
             if (breakpoint == null) {
                 return finishReplyFailed(reply, "no breakpoint number " + breakpointNumber);
             }
-            breakpoint.dispose();
+            replServer.clearBreakpoint(breakpoint);
             reply.put(REPLMessage.BREAKPOINT_ID, Integer.toString(breakpointNumber));
             return finishReplySucceeded(reply, "Breakpoint " + breakpointNumber + " cleared");
         }
--- a/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServer.java	Thu Nov 12 12:09:24 2015 -0800
+++ b/truffle/com.oracle.truffle.tools.debug.shell/src/com/oracle/truffle/tools/debug/shell/server/REPLServer.java	Thu Nov 12 12:24:45 2015 -0800
@@ -424,6 +424,11 @@
         return id == null ? -1 : id;
     }
 
+    void clearBreakpoint(Breakpoint breakpoint) {
+        breakpoint.dispose();
+        breakpoints.remove(breakpoint);
+    }
+
     void call(String name) throws IOException {
         Value symbol = engine.findGlobalSymbol(name);
         if (symbol == null) {