[GR-69051] When removing an event request, remove the request filter also.

PullRequest: graal/22009

Author: entlicher

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/EventFilters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, 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
@@ -33,23 +33,24 @@ public final class EventFilters {
     private RequestFilter[] requestFilters = new RequestFilter[0];
 
     public void addFilter(RequestFilter filter) {
+        Lock writeLock = lock.writeLock();
+        writeLock.lock();
         try {
-            lock.writeLock().lock();
             RequestFilter[] temp = new RequestFilter[requestFilters.length + 1];
             System.arraycopy(requestFilters, 0, temp, 0, requestFilters.length);
             temp[requestFilters.length] = filter;
             requestFilters = temp;
         } finally {
-            lock.writeLock().unlock();
+            writeLock.unlock();
         }
     }
 
     public RequestFilter getRequestFilter(int requestId) {
         Lock readLock = lock.readLock();
+        readLock.lock();
         try {
-            readLock.lock();
             // likely the filters are required from last inserted
-            for (int i = requestFilters.length - 1; i > -1; i--) {
+            for (int i = requestFilters.length - 1; i >= 0; i--) {
                 RequestFilter filter = requestFilters[i];
                 if (filter != null) {
                     if (filter.getRequestId() == requestId) {
@@ -63,6 +64,34 @@ public RequestFilter getRequestFilter(int requestId) {
         }
     }
 
+    public RequestFilter removeRequestFilter(int requestId) {
+        Lock writeLock = lock.writeLock();
+        writeLock.lock();
+        try {
+            // likely the filters are required from last inserted
+            for (int i = requestFilters.length - 1; i >= 0; i--) {
+                RequestFilter filter = requestFilters[i];
+                if (filter != null) {
+                    if (filter.getRequestId() == requestId) {
+                        RequestFilter[] temp = new RequestFilter[requestFilters.length - 1];
+                        // Copy with `i` index removed.
+                        if (i > 0) {
+                            System.arraycopy(requestFilters, 0, temp, 0, i);
+                        }
+                        if (i < requestFilters.length - 1) {
+                            System.arraycopy(requestFilters, i + 1, temp, i, requestFilters.length - i - 1);
+                        }
+                        requestFilters = temp;
+                        return filter;
+                    }
+                }
+            }
+            return null;
+        } finally {
+            writeLock.unlock();
+        }
+    }
+
     public void clearAll() {
         try {
             lock.writeLock().lock();

espresso/src/com.oracle.truffle.espresso.jdwp/src/com/oracle/truffle/espresso/jdwp/impl/RequestedJDWPEvents.java

@@ -298,7 +298,7 @@ public CommandResult clearRequest(Packet packet) {
 
         byte eventKind = input.readByte();
         int requestId = input.readInt();
-        RequestFilter requestFilter = controller.getEventFilters().getRequestFilter(requestId);
+        RequestFilter requestFilter = controller.getEventFilters().removeRequestFilter(requestId);
 
         if (requestFilter != null) {
             byte kind = requestFilter.getEventKind();