[java] handle events only once

SeleniumHQ · Aug 27, 2023 · bbe2ac5 · bbe2ac5
1 parent edb4c75
commit bbe2ac5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/java/src/org/openqa/selenium/devtools/NetworkInterceptor.java b/java/src/org/openqa/selenium/devtools/NetworkInterceptor.java
@@ -100,7 +100,6 @@ public NetworkInterceptor(WebDriver driver, Filter filter) {
   @Override
   public void close() {
     tools.getDomains().network().resetNetworkFilter();
-    tools.getDomains().network().markNetworkInterceptorClosed();
   }
 
   protected HttpMethod convertFromCdpHttpMethod(String method) {

diff --git a/java/src/org/openqa/selenium/devtools/idealized/Network.java b/java/src/org/openqa/selenium/devtools/idealized/Network.java
@@ -62,13 +62,14 @@ public abstract class Network<AUTHREQUIRED, REQUESTPAUSED> {
   private volatile Filter filter = defaultFilter;
   protected final DevTools devTools;
 
-  private final AtomicBoolean networkInterceptorClosed = new AtomicBoolean();
+  private final AtomicBoolean fetchEnabled = new AtomicBoolean();
 
   public Network(DevTools devtools) {
     this.devTools = Require.nonNull("DevTools", devtools);
   }
 
   public void disable() {
+    fetchEnabled.set(false);
     devTools.send(disableFetch());
     devTools.send(enableNetworkCaching());
 
@@ -141,10 +142,6 @@ public void resetNetworkFilter() {
     filter = defaultFilter;
   }
 
-  public void markNetworkInterceptorClosed() {
-    networkInterceptorClosed.set(true);
-  }
-
   public void interceptTrafficWith(Filter filter) {
     Require.nonNull("HTTP filter", filter);
 
@@ -153,6 +150,11 @@ public void interceptTrafficWith(Filter filter) {
   }
 
   public void prepareToInterceptTraffic() {
+    if (fetchEnabled.getAndSet(true)) {
+      // ensure we do not register the listeners multiple times, otherwise the events are handled
+      // multiple times
+      return;
+    }
     devTools.send(disableNetworkCaching());
 
     devTools.addListener(
@@ -221,7 +223,7 @@ public void prepareToInterceptTraffic() {
                             Thread.currentThread().interrupt();
                             throw new WebDriverException(e);
                           } catch (ExecutionException e) {
-                            if (!networkInterceptorClosed.get()) {
+                            if (fetchEnabled.get()) {
                               LOG.log(WARNING, e, () -> "Unable to process request");
                             }
                             return new HttpResponse();
@@ -236,8 +238,8 @@ public void prepareToInterceptTraffic() {
 
             devTools.send(fulfillRequest(pausedRequest, forBrowser));
           } catch (TimeoutException e) {
-            if (!networkInterceptorClosed.get()) {
-              throw new WebDriverException(e);
+            if (fetchEnabled.get()) {
+              throw e;
             }
           }
         });